minor code cleanup

git-svn-id: http://svn.gnome.org/svn/krb5-auth-dialog/trunk@8 517b70f8-ed25-0410-8bf6-f5db08f7b76e

diff --git a/src/krb5-auth-dialog.c b/src/krb5-auth-dialog.c
index 42674d73beb3f9e92d753a621c11c37d28f2d9d0..4de01ddb884ee92a669b45866d853589a18f5daf 100644 (file)
--- a/src/krb5-auth-dialog.c
+++ b/src/krb5-auth-dialog.c
@@ -47,9 +47,10 @@ whoami (const char **username)
   uid_t uid;
 
   uid = geteuid();
-  if (!(p = getpwuid(uid))) {
-    return -1;
-  }
+  if (!(p = getpwuid(uid)))
+    {
+      return -1;
+    }
 
   *username = p->pw_name;
 
@@ -63,27 +64,27 @@ setup_dialog(GladeXML *xml, GtkWidget *dialog, gchar *prompt)
   GtkWidget *label;
 
   /* Clear the password entry field */
-  entry = glade_xml_get_widget(xml, "krb5_entry");
-  gtk_entry_set_text (GTK_ENTRY(entry), "");
+  entry = glade_xml_get_widget (xml, "krb5_entry");
+  gtk_entry_set_text (GTK_ENTRY (entry), "");
 
   /* Use the prompt label that krb5 provides us */
-  label = glade_xml_get_widget(xml, "krb5_message_label");
-  gtk_label_set_text(GTK_LABEL (label), prompt);
+  label = glade_xml_get_widget (xml, "krb5_message_label");
+  gtk_label_set_text (GTK_LABEL (label), prompt);
 
   /* Only hide, and not destroy the dialog, so we can re-use it later. */
-  g_signal_connect(dialog, "response", 
-                   G_CALLBACK (gtk_widget_hide),
-                   dialog);
+  g_signal_connect (dialog, "response",
+                   G_CALLBACK (gtk_widget_hide),
+                   dialog);
 }
 
 static krb5_error_code
 KRB5_CALLCONV
-krb5_gtk_prompter(krb5_context ctx,
-                  void *data,
-                  const char *name,
-                  const char *banner,
-                  int num_prompts,
-                  krb5_prompt prompts[])
+krb5_gtk_prompter (krb5_context ctx,
+                  void *data,
+                  const char *name,
+                  const char *banner,
+                  int num_prompts,
+                  krb5_prompt prompts[])
 {
   GtkWidget *dialog;
   krb5_error_code errcode;
@@ -91,39 +92,40 @@ krb5_gtk_prompter(krb5_context ctx,
 
   errcode = KRB5_LIBOS_CANTREADPWD;
 
-  dialog = glade_xml_get_widget(xml, "krb5_dialog");
+  dialog = glade_xml_get_widget (xml, "krb5_dialog");
 
-  for (i = 0; i < num_prompts; i++) {
-    const gchar *password = NULL;
-    int password_len = 0;
-    int response;
+  for (i = 0; i < num_prompts; i++)
+    {
+      const gchar *password = NULL;
+      int password_len = 0;
+      int response;
 
-    GtkWidget *entry;
+      GtkWidget *entry;
 
-    errcode = KRB5_LIBOS_CANTREADPWD;
+      errcode = KRB5_LIBOS_CANTREADPWD;
 
-    entry = glade_xml_get_widget(xml, "krb5_entry");
-    setup_dialog(xml, dialog, (gchar *)prompts[i].prompt);
+      entry = glade_xml_get_widget(xml, "krb5_entry");
+      setup_dialog(xml, dialog, (gchar *) prompts[i].prompt);
 
-    response = gtk_dialog_run (GTK_DIALOG (dialog));
+      response = gtk_dialog_run (GTK_DIALOG (dialog));
 
-    switch (response)
-      {
-      case GTK_RESPONSE_OK:
-        password = gtk_entry_get_text (GTK_ENTRY (entry));
-        password_len = strlen (password);
-        errcode = 0;
-        break;
-      case GTK_RESPONSE_CANCEL:
-      case GTK_RESPONSE_DELETE_EVENT:
-        break;
-      default:
-        g_assert_not_reached ();
-      }
+      switch (response)
+       {
+       case GTK_RESPONSE_OK:
+         password = gtk_entry_get_text (GTK_ENTRY (entry));
+         password_len = strlen (password);
+         errcode = 0;
+         break;
+       case GTK_RESPONSE_CANCEL:
+       case GTK_RESPONSE_DELETE_EVENT:
+         break;
+       default:
+         g_assert_not_reached ();
+       }
 
-    prompts[i].reply->data = (char *)password;
-    prompts[i].reply->length = password_len;
-  }
+      prompts[i].reply->data = (char *) password;
+      prompts[i].reply->length = password_len;
+    }
 
   return errcode;
 }
@@ -141,58 +143,60 @@ credentials_expiring_real (void)
 
   gboolean retval = FALSE;
 
-  memset(&my_creds, 0, sizeof(my_creds));
+  memset (&my_creds, 0, sizeof(my_creds));
 
-  code = krb5_init_context(&kcontext);
-  if (code) {
+  code = krb5_init_context (&kcontext);
+  if (code)
     return FALSE;
-  }
 
-  if ((code = krb5_cc_default(kcontext, &cache))) {
+  if ((code = krb5_cc_default(kcontext, &cache)))
     return FALSE;
-  }
 
   flags = 0;                /* turns off OPENCLOSE mode */
-  if ((code = krb5_cc_set_flags(kcontext, cache, flags))) {
-    if (code == KRB5_FCC_NOFILE) {
+  if ((code = krb5_cc_set_flags(kcontext, cache, flags)))
+    {
+      if (code == KRB5_FCC_NOFILE) {
 #ifdef KRB5_KRB4_COMPAT
         if (name == NULL)
-            do_v4_ccache(0);
+         do_v4_ccache(0);
 #endif
+      }
+      exit(1);
     }
-    exit(1);
-  }
 
-  if ((code = krb5_cc_get_principal(kcontext, cache, &princ))) {
+  if ((code = krb5_cc_get_principal(kcontext, cache, &princ)))
     exit(1);
-  }
-  if ((code = krb5_unparse_name(kcontext, princ, &defname))) {
+
+  if ((code = krb5_unparse_name(kcontext, princ, &defname)))
     exit(1);
-  }
-  if ((code = krb5_cc_start_seq_get(kcontext, cache, &cur))) {
+
+  if ((code = krb5_cc_start_seq_get(kcontext, cache, &cur)))
     exit(1);
-  }
-  while (!(code = krb5_cc_next_cred(kcontext, cache, &cur, &my_creds))) {
-    if (my_creds.times.endtime - time(0) < SECONDS_BEFORE_PROMPTING)
+
+  while (!(code = krb5_cc_next_cred(kcontext, cache, &cur, &my_creds)))
+    {
+      if (my_creds.times.endtime - time(0) < SECONDS_BEFORE_PROMPTING)
         retval = TRUE;
-    krb5_free_cred_contents(kcontext, &my_creds);
-  }
-  if (code == KRB5_CC_END) {
-    if ((code = krb5_cc_end_seq_get(kcontext, cache, &cur))) {
-          exit(1);
+      krb5_free_cred_contents(kcontext, &my_creds);
     }
-    flags = KRB5_TC_OPENCLOSE;  /* turns on OPENCLOSE mode, from klist.c */
-    if ((code = krb5_cc_set_flags(kcontext, cache, flags))) {
+  if (code == KRB5_CC_END)
+    {
+      if ((code = krb5_cc_end_seq_get(kcontext, cache, &cur)))
+       exit(1);
+      flags = KRB5_TC_OPENCLOSE;  /* turns on OPENCLOSE mode, from klist.c */
+      if ((code = krb5_cc_set_flags(kcontext, cache, flags)))
         exit(1);
-    }
 #ifdef KRB5_KRB4_COMPAT
-    if (name == NULL && !status_only)
+      if (name == NULL && !status_only)
         do_v4_ccache(0);
 #endif
-    if (exit_status) exit(exit_status);
-  } else {
-    exit(1);
-  }
+      if (exit_status)
+       exit(exit_status);
+    }
+  else
+    {
+      exit(1);
+    }
 
   return retval;
 }
@@ -200,9 +204,9 @@ credentials_expiring_real (void)
 static gboolean
 credentials_expiring (gpointer *data)
 {
-  if (credentials_expiring_real()) {
+  if (credentials_expiring_real())
     renew_credentials();
-  }
+
   return TRUE;
 }
 
@@ -219,47 +223,43 @@ renew_credentials (void)
   krb5_get_init_creds_opt_init(&options);
 
   retval = krb5_init_context(&kcontext);
-  if (retval) {
+  if (retval)
     return retval;
-  }
-  
+
   retval = whoami(&username);
-  if (retval) {
+  if (retval)
     return retval;
-  }
 
   retval = krb5_parse_name(kcontext, username, &kprincipal);
-  if (retval) {
+  if (retval)
     return retval;
-  }
 
   retval = krb5_get_init_creds_password(kcontext, &my_creds, kprincipal,
                                         NULL, krb5_gtk_prompter, 0,
                                         0,
                                         NULL,
                                         &options);
-  if (retval) {
-    if (retval == KRB5KRB_AP_ERR_BAD_INTEGRITY) {
-      /* Invalid password, try again. */
-      return renew_credentials();
+  if (retval)
+    {
+      if (retval == KRB5KRB_AP_ERR_BAD_INTEGRITY)
+       {
+         /* Invalid password, try again. */
+         return renew_credentials();
+       }
+      return retval;
     }
-    return retval;
-  }
 
   retval = krb5_cc_default(kcontext, &ccache);
-  if (retval) {
+  if (retval)
     return retval;
-  }
 
   retval = krb5_cc_initialize(kcontext, ccache, kprincipal);
-  if (retval) {
+  if (retval)
     return retval;
-  }
 
   retval = krb5_cc_store_cred(kcontext, ccache, &my_creds);
-  if (retval) {
+  if (retval)
     return retval;
-  }
 
   return 0;
 }
@@ -269,10 +269,10 @@ main (int argc, char *argv[])
 {
   GtkWidget *dialog;
 
-  gtk_init(&argc, &argv);
+  gtk_init (&argc, &argv);
 
-  xml = glade_xml_new(GLADEDIR "krb5-auth-dialog.glade", NULL, NULL);
-  dialog = glade_xml_get_widget(xml, "krb5_dialog");
+  xml = glade_xml_new (GLADEDIR "krb5-auth-dialog.glade", NULL, NULL);
+  dialog = glade_xml_get_widget (xml, "krb5_dialog");
 
   g_timeout_add (CREDENTIAL_CHECK_INTERVAL, (GSourceFunc)credentials_expiring, NULL);
   credentials_expiring (NULL);