3 files changed, 10 insertions, 10 deletions

diff --git a/tools/iphone_id.c b/tools/iphone_id.c
index 80f22e1..4a2c3af 100644
--- a/tools/iphone_id.c
+++ b/tools/iphone_id.c
@@ -38,7 +38,6 @@ int main(int argc, char **argv)
         /* parse cmdline args */
         for (i = 1; i < argc; i++) {
                 if (!strcmp(argv[i], "-d") || !strcmp(argv[i], "--debug")) {
-                        iphone_set_debug_mask(DBGMASK_ALL);
                         iphone_set_debug_level(1);
                         continue;
                 }
@@ -70,7 +69,7 @@ int main(int argc, char **argv)
                         return -2;
                 }
 
-                if (LOCKDOWN_E_SUCCESS != lockdownd_client_new(phone, &client)) {
+                if (LOCKDOWN_E_SUCCESS != lockdownd_client_new(phone, &client, "iphone_id")) {
                         iphone_device_free(phone);
                         fprintf(stderr, "ERROR: Connecting to device failed!\n");
                         return -2;
diff --git a/tools/iphoneinfo.c b/tools/iphoneinfo.c
index e0d7693..7c41033 100644
--- a/tools/iphoneinfo.c
+++ b/tools/iphoneinfo.c
@@ -37,12 +37,18 @@ static const char *domains[] = {
         "com.apple.mobile.debug",. */
         "com.apple.xcode.developerdomain",
         "com.apple.international",
+        "com.apple.mobile.data_sync",
+        "com.apple.mobile.tethered_sync",
         "com.apple.mobile.mobile_application_usage",
         "com.apple.mobile.backup",
+        "com.apple.mobile.nikita",
+        "com.apple.mobile.restriction",
         "com.apple.mobile.user_preferences",
         "com.apple.mobile.sync_data_class",
         "com.apple.mobile.software_behavior",
         "com.apple.mobile.iTunes.SQLMusicLibraryPostProcessCommands",
+        "com.apple.mobile.iTunes.accessories",
+        "com.apple.fairplay",
         "com.apple.iTunes",
         "com.apple.mobile.iTunes.store",
         "com.apple.mobile.iTunes",
@@ -72,7 +78,6 @@ int main(int argc, char *argv[])
         /* parse cmdline args */
         for (i = 1; i < argc; i++) {
                 if (!strcmp(argv[i], "-d") || !strcmp(argv[i], "--debug")) {
-                        iphone_set_debug_mask(DBGMASK_ALL);
                         iphone_set_debug_level(1);
                         continue;
                 }
@@ -136,7 +141,7 @@ int main(int argc, char *argv[])
                 }
         }
 
-        if (LOCKDOWN_E_SUCCESS != lockdownd_client_new(phone, &client)) {
+        if (LOCKDOWN_E_SUCCESS != lockdownd_client_new_with_handshake(phone, &client, "iphoneinfo")) {
                 iphone_device_free(phone);
                 return -1;
         }
@@ -278,13 +283,10 @@ void plist_children_to_string(plist_t node)
         plist_dict_next_item(node, it, &key, &subnode);
         while (subnode)
         {
-                subnode = NULL;
-
                 printf("%s: ", key);
                 free(key);
                 key = NULL;
                 plist_node_to_string(subnode);
-
                 plist_dict_next_item(node, it, &key, &subnode);
         }
         free(it);
diff --git a/tools/iphonesyslog.c b/tools/iphonesyslog.c
index 8fa3b04..017956e 100644
--- a/tools/iphonesyslog.c
+++ b/tools/iphonesyslog.c
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
         iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
         int i;
         char uuid[41];
-        int port = 0;
+        uint16_t port = 0;
         uuid[0] = 0;
 
         signal(SIGINT, clean_exit);
@@ -60,7 +60,6 @@ int main(int argc, char *argv[])
         /* parse cmdline args */
         for (i = 1; i < argc; i++) {
                 if (!strcmp(argv[i], "-d") || !strcmp(argv[i], "--debug")) {
-                        iphone_set_debug_mask(DBGMASK_ALL);
                         iphone_set_debug_level(1);
                         continue;
                 }
@@ -99,7 +98,7 @@ int main(int argc, char *argv[])
                 }
         }
 
-        if (LOCKDOWN_E_SUCCESS != lockdownd_client_new(phone, &client)) {
+        if (LOCKDOWN_E_SUCCESS != lockdownd_client_new_with_handshake(phone, &client, "iphonesyslog")) {
                 iphone_device_free(phone);
                 return -1;
         }