=== modified file 'plugin-runner.c'
--- plugin-runner.c	2009-01-13 01:36:46 +0000
+++ plugin-runner.c	2009-01-13 04:29:35 +0000
@@ -464,17 +464,17 @@
       break;
     case 130:			/* --userid */
       /* In the GNU C library, uid_t is always unsigned int */
-      ret = sscanf(arg, "%ud", &uid);
+      ret = sscanf(arg, "%u", &uid);
       if(ret != 1){
-	fprintf(stderr, "Bad user ID number: \"%s\", using %ud\n",
-		arg, uid);
+	fprintf(stderr, "Bad user ID number: \"%s\", using %u\n", arg,
+		uid);
       }
       break;
     case 131:			/* --groupid */
       /* In the GNU C library, gid_t is always unsigned int */
-      ret = sscanf(arg, "%ud", &gid);
+      ret = sscanf(arg, "%u", &gid);
       if(ret != 1){
-	fprintf(stderr, "Bad group ID number: \"%s\", using %ud\n",
+	fprintf(stderr, "Bad group ID number: \"%s\", using %u\n",
 		arg, gid);
       }
       break;
@@ -539,7 +539,7 @@
 		       .args_doc = "",
 		       .doc = "Mandos plugin runner -- Run plugins" };
   
-  /* Parse using the parse_opt_config_file in order to get the custom
+  /* Parse using parse_opt_config_file() in order to get the custom
      config file location, if any. */
   ret = argp_parse (&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
   if (ret == ARGP_ERR_UNKNOWN){
@@ -968,7 +968,7 @@
 		      (unsigned int) (proc->pid),
 		      WTERMSIG(proc->status));
 	    } else if(WCOREDUMP(proc->status)){
-	      fprintf(stderr, "Plugin %d dumped core\n",
+	      fprintf(stderr, "Plugin %u dumped core\n",
 		      (unsigned int) (proc->pid));
 	    }
 	  }

=== modified file 'plugins.d/password-prompt.c'
--- plugins.d/password-prompt.c	2009-01-10 06:00:50 +0000
+++ plugins.d/password-prompt.c	2009-01-13 04:29:35 +0000
@@ -81,8 +81,6 @@
     };
     
     error_t parse_opt (int key, char *arg, struct argp_state *state) {
-      /* Get the INPUT argument from `argp_parse', which we know is a
-	 pointer to our plugin list pointer. */
       switch (key) {
       case 'p':
 	prefix = arg;

=== modified file 'plugins.d/splashy.c'
--- plugins.d/splashy.c	2009-01-13 01:36:46 +0000
+++ plugins.d/splashy.c	2009-01-13 04:29:35 +0000
@@ -269,7 +269,7 @@
     /* Child; will become new splashy process */
     
     /* Make the effective user ID (root) the only user ID instead of
-       the real user ID (mandos) */
+       the real user ID (_mandos) */
     ret = setuid(geteuid());
     if(ret == -1){
       perror("setuid");

=== modified file 'plugins.d/usplash.c'
--- plugins.d/usplash.c	2009-01-13 01:36:46 +0000
+++ plugins.d/usplash.c	2009-01-13 04:29:35 +0000
@@ -487,7 +487,7 @@
     /* Child; will become new usplash process */
     
     /* Make the effective user ID (root) the only user ID instead of
-       the real user ID (mandos) */
+       the real user ID (_mandos) */
     ret = setuid(geteuid());
     if(ret == -1){
       perror("setuid");