5 files changed, 17 insertions, 0 deletions
diff --git a/src/main.c b/src/main.c
index a9221cdc..8516d7bc 100644
--- a/src/main.c
+++ b/src/main.c
@@ -165,6 +165,7 @@ main (int argc, char *argv[])
                        mm_context_get_log_journal (),
                        mm_context_get_log_timestamps (),
                        mm_context_get_log_relative_timestamps (),
+                       mm_context_get_log_personal_info (),
                        &error)) {
         g_printerr ("error: failed to set up logging: %s\n", error->message);
         g_error_free (error);
diff --git a/src/mm-context.c b/src/mm-context.c
index ee9b372c..37793e5a 100644
--- a/src/mm-context.c
+++ b/src/mm-context.c
@@ -134,6 +134,7 @@ static const gchar *log_file;
 static gboolean     log_journal;
 static gboolean     log_show_ts;
 static gboolean     log_rel_ts;
+static gboolean     log_personal_info;
 
 static const GOptionEntry log_entries[] = {
     {
@@ -163,6 +164,11 @@ static const GOptionEntry log_entries[] = {
         "Use relative timestamps (from MM start)",
         NULL
     },
+    {
+        "log-personal-info", 0, 0, G_OPTION_ARG_NONE, &log_personal_info,
+        "Show personal info in logs",
+        NULL
+    },
     { NULL }
 };
 
@@ -210,6 +216,12 @@ mm_context_get_log_relative_timestamps (void)
     return log_rel_ts;
 }
 
+gboolean
+mm_context_get_log_personal_info (void)
+{
+    return log_personal_info;
+}
+
 /*****************************************************************************/
 /* Test context */
 
diff --git a/src/mm-context.h b/src/mm-context.h
index 2a69e11c..8a5c0458 100644
--- a/src/mm-context.h
+++ b/src/mm-context.h
@@ -41,6 +41,7 @@ const gchar *mm_context_get_log_file                (void);
 gboolean     mm_context_get_log_journal             (void);
 gboolean     mm_context_get_log_timestamps          (void);
 gboolean     mm_context_get_log_relative_timestamps (void);
+gboolean     mm_context_get_log_personal_info       (void);
 
 /* Testing support */
 gboolean     mm_context_get_test_session           (void);
diff --git a/src/mm-log.c b/src/mm-log.c
index 22a39012..7b81d9fa 100644
--- a/src/mm-log.c
+++ b/src/mm-log.c
@@ -310,6 +310,7 @@ mm_log_setup (const char *level,
               gboolean log_journal,
               gboolean show_timestamps,
               gboolean rel_timestamps,
+              gboolean show_personal_info,
               GError **error)
 {
     /* levels */
@@ -366,6 +367,7 @@ mm_log_setup (const char *level,
 #endif
 
 #if defined WITH_MBIM
+    mbim_utils_set_show_personal_info (show_personal_info);
     g_log_set_handler ("Mbim",
                        G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL | G_LOG_FLAG_RECURSION,
                        log_handler,
diff --git a/src/mm-log.h b/src/mm-log.h
index d0b5c607..4c643e28 100644
--- a/src/mm-log.h
+++ b/src/mm-log.h
@@ -60,6 +60,7 @@ gboolean mm_log_setup (const char *level,
                        gboolean log_journal,
                        gboolean show_ts,
                        gboolean rel_ts,
+                       gboolean show_personal_info,
                        GError **error);
 
 void mm_log_shutdown (void);