summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Martin Szulecki2009-11-19 21:48:59 +0100
committerGravatar Martin Szulecki2009-11-19 21:48:59 +0100
commitf21026094deb8fed64021c000827ea867b50ceb6 (patch)
treed4a3c289a8becaaaf2c8534afef916a20b7b4978
parentf2d94b69d8c4ced70b2fb7cee7e6c9464e2717af (diff)
parent658856df1bf2282ff5243346218373f51edfedd1 (diff)
downloadlibimobiledevice-f21026094deb8fed64021c000827ea867b50ceb6.tar.gz
libimobiledevice-f21026094deb8fed64021c000827ea867b50ceb6.tar.bz2
Merge branch 'master' of git://github.com/MattColyer/libiphone into martin
-rw-r--r--.gitignore51
-rw-r--r--src/lockdown.c1
2 files changed, 52 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..73b722c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,51 @@
1# git-ls-files --others --exclude-from=.git/info/exclude
2# Lines that start with '#' are comments.
3# For a project mostly in C, the following would be a good set of
4# exclude patterns (uncomment them if you want to use them):
5*.[oa]
6*~
7*.po
8*.lo
9*.la
10autom4te.cache/*
11*.in
12*/.deps/*
13m4/*
14swig/*
15*.swp
16aclocal.m4
17config.h
18config.log
19config.sub
20config.guess
21config.status
22configure
23depcomp
24install-sh
25compile
26main
27ltmain.sh
28missing
29mkinstalldirs
30libtool
31*Makefile
32py-compile
33stamp-h1
34src/.libs
35src/ifuse
36src/iphoneclient
37src/lckd-client
38src/libiphone-initconf
39src/plutil
40docs/*
41libiphone-1.0.pc
42dev/.libs/*
43dev/afccheck
44dev/iphoneclient
45dev/iphonesyslog
46dev/lckd-client
47dev/msyncclient
48tools/.libs/*
49tools/iphone_id
50tools/iphoneinfo
51tools/iphonesyslog
diff --git a/src/lockdown.c b/src/lockdown.c
index 3bfd16f..d147f75 100644
--- a/src/lockdown.c
+++ b/src/lockdown.c
@@ -640,6 +640,7 @@ lockdownd_error_t lockdownd_client_new(iphone_device_t device, lockdownd_client_
640 lockdownd_client_t client_loc = (lockdownd_client_t) malloc(sizeof(struct lockdownd_client_int)); 640 lockdownd_client_t client_loc = (lockdownd_client_t) malloc(sizeof(struct lockdownd_client_int));
641 client_loc->connection = connection; 641 client_loc->connection = connection;
642 client_loc->ssl_session = NULL; 642 client_loc->ssl_session = NULL;
643 client_loc->ssl_certificate = NULL;
643 client_loc->in_SSL = 0; 644 client_loc->in_SSL = 0;
644 645
645 if (LOCKDOWN_E_SUCCESS != lockdownd_query_type(client_loc)) { 646 if (LOCKDOWN_E_SUCCESS != lockdownd_query_type(client_loc)) {