reindent to style in doc/coding-style, via gnu indent

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17447 dc483132-0cff-0310-8789-dd5450dbe970

1 files changed, 511 insertions, 505 deletions

diff --git a/src/appl/gss-sample/gss-server.c b/src/appl/gss-sample/gss-server.c
index dae67af..4297ca2 100644
--- a/src/appl/gss-sample/gss-server.c
+++ b/src/appl/gss-sample/gss-server.c
@@ -65,20 +65,22 @@
 #include <strings.h>
 #endif
 
-static void usage()
+static void
+usage()
 {
-     fprintf(stderr, "Usage: gss-server [-port port] [-verbose] [-once]");
+    fprintf(stderr, "Usage: gss-server [-port port] [-verbose] [-once]");
 #ifdef _WIN32
-     fprintf(stderr, " [-threads num]");
+    fprintf(stderr, " [-threads num]");
 #endif
-     fprintf(stderr, "\n");
-     fprintf(stderr, "       [-inetd] [-export] [-logfile file] service_name\n");
-     exit(1);
+    fprintf(stderr, "\n");
+    fprintf(stderr,
+	    "       [-inetd] [-export] [-logfile file] service_name\n");
+    exit(1);
 }
 
-FILE *log;
+FILE   *log;
 
-int verbose = 0;
+int     verbose = 0;
 
 /*
  * Function: server_acquire_creds
@@ -99,34 +101,35 @@ int verbose = 0;
  * fails, an error message is displayed and -1 is returned; otherwise,
  * 0 is returned.
  */
-static int server_acquire_creds(service_name, server_creds)
-     char *service_name;
-     gss_cred_id_t *server_creds;
+static int
+server_acquire_creds(service_name, server_creds)
+    char   *service_name;
+    gss_cred_id_t *server_creds;
 {
-     gss_buffer_desc name_buf;
-     gss_name_t server_name;
-     OM_uint32 maj_stat, min_stat;
-
-     name_buf.value = service_name;
-     name_buf.length = strlen(name_buf.value) + 1;
-     maj_stat = gss_import_name(&min_stat, &name_buf, 
-				(gss_OID) gss_nt_service_name, &server_name);
-     if (maj_stat != GSS_S_COMPLETE) {
-	  display_status("importing name", maj_stat, min_stat);
-	  return -1;
-     }
-
-     maj_stat = gss_acquire_cred(&min_stat, server_name, 0,
-				 GSS_C_NULL_OID_SET, GSS_C_ACCEPT,
-				 server_creds, NULL, NULL);
-     if (maj_stat != GSS_S_COMPLETE) {
-	  display_status("acquiring credentials", maj_stat, min_stat);
-	  return -1;
-     }
-
-     (void) gss_release_name(&min_stat, &server_name);
-
-     return 0;
+    gss_buffer_desc name_buf;
+    gss_name_t server_name;
+    OM_uint32 maj_stat, min_stat;
+
+    name_buf.value = service_name;
+    name_buf.length = strlen(name_buf.value) + 1;
+    maj_stat = gss_import_name(&min_stat, &name_buf,
+			       (gss_OID) gss_nt_service_name, &server_name);
+    if (maj_stat != GSS_S_COMPLETE) {
+	display_status("importing name", maj_stat, min_stat);
+	return -1;
+    }
+
+    maj_stat = gss_acquire_cred(&min_stat, server_name, 0,
+				GSS_C_NULL_OID_SET, GSS_C_ACCEPT,
+				server_creds, NULL, NULL);
+    if (maj_stat != GSS_S_COMPLETE) {
+	display_status("acquiring credentials", maj_stat, min_stat);
+	return -1;
+    }
+
+    (void) gss_release_name(&min_stat, &server_name);
+
+    return 0;
 }
 
 /*
@@ -152,132 +155,123 @@ static int server_acquire_creds(service_name, server_creds)
  * in client_name and 0 is returned.  If unsuccessful, an error
  * message is displayed and -1 is returned.
  */
-static int server_establish_context(s, server_creds, context, client_name, 
-				    ret_flags)
-     int s;
-     gss_cred_id_t server_creds;
-     gss_ctx_id_t *context;
-     gss_buffer_t client_name;
-     OM_uint32 *ret_flags;
+static int
+server_establish_context(s, server_creds, context, client_name, ret_flags)
+    int     s;
+    gss_cred_id_t server_creds;
+    gss_ctx_id_t *context;
+    gss_buffer_t client_name;
+    OM_uint32 *ret_flags;
 {
-     gss_buffer_desc send_tok, recv_tok;
-     gss_name_t client;
-     gss_OID doid;
-     OM_uint32 maj_stat, min_stat, acc_sec_min_stat;
-     gss_buffer_desc	oid_name;
-     int token_flags;
-
-     if (recv_token(s, &token_flags, &recv_tok) < 0)
-       return -1;
-
-     if (recv_tok.value) {
-       free (recv_tok.value);
-       recv_tok.value = NULL;
-     }
-
-     if (! (token_flags & TOKEN_NOOP)) {
-       if (log)
-	 fprintf(log, "Expected NOOP token, got %d token instead\n",
-		 token_flags);
-       return -1;
-     }
-
-     *context = GSS_C_NO_CONTEXT;
-
-     if (token_flags & TOKEN_CONTEXT_NEXT) {
-       do {
-	 if (recv_token(s, &token_flags, &recv_tok) < 0)
-	   return -1;
-
-	 if (verbose && log) {
-	   fprintf(log, "Received token (size=%d): \n", (int) recv_tok.length);
-	   print_token(&recv_tok);
-	 }
-
-	 maj_stat =
-	   gss_accept_sec_context(&acc_sec_min_stat,
-				  context,
-				  server_creds,
-				  &recv_tok,
-				  GSS_C_NO_CHANNEL_BINDINGS,
-				  &client,
-				  &doid,
-				  &send_tok,
-				  ret_flags,
-				  NULL, 	/* ignore time_rec */
-				  NULL); 	/* ignore del_cred_handle */
-
-	 if(recv_tok.value) {
-	     free(recv_tok.value);
-	     recv_tok.value = NULL;
-	 }
-
-	 if (send_tok.length != 0) {
-	   if (verbose && log) {
-	     fprintf(log,
-		     "Sending accept_sec_context token (size=%d):\n",
-		     (int) send_tok.length);
-	     print_token(&send_tok);
-	   }
-	   if (send_token(s, TOKEN_CONTEXT, &send_tok) < 0) {
-	     if (log)
-	       fprintf(log, "failure sending token\n");
-	     return -1;
-	   }
-
-	   (void) gss_release_buffer(&min_stat, &send_tok);
-	 }
-	 if (maj_stat!=GSS_S_COMPLETE && maj_stat!=GSS_S_CONTINUE_NEEDED) {
-	      display_status("accepting context", maj_stat,
-			     acc_sec_min_stat);
-	      if (*context != GSS_C_NO_CONTEXT)
-		      gss_delete_sec_context(&min_stat, context,
-					     GSS_C_NO_BUFFER);
-	      return -1;
-	 }
- 
-	 if (verbose && log) {
-	   if (maj_stat == GSS_S_CONTINUE_NEEDED)
-	     fprintf(log, "continue needed...\n");
-	   else
-	     fprintf(log, "\n");
-	   fflush(log);
-	 }
-       } while (maj_stat == GSS_S_CONTINUE_NEEDED);
-
-       /* display the flags */
-       display_ctx_flags(*ret_flags);
-
-       if (verbose && log) {
-	 maj_stat = gss_oid_to_str(&min_stat, doid, &oid_name);
-	 if (maj_stat != GSS_S_COMPLETE) {
-	   display_status("converting oid->string", maj_stat, min_stat);
-	   return -1;
-	 }
-	 fprintf(log, "Accepted connection using mechanism OID %.*s.\n",
-		 (int) oid_name.length, (char *) oid_name.value);
-	 (void) gss_release_buffer(&min_stat, &oid_name);
-       }
-
-       maj_stat = gss_display_name(&min_stat, client, client_name, &doid);
-       if (maj_stat != GSS_S_COMPLETE) {
-	 display_status("displaying name", maj_stat, min_stat);
-	 return -1;
-       }
-       maj_stat = gss_release_name(&min_stat, &client);
-       if (maj_stat != GSS_S_COMPLETE) {
-	 display_status("releasing name", maj_stat, min_stat);
-	 return -1;
-       }
-     }
-     else {
-       client_name->length = *ret_flags = 0;
-
-       if (log)
-	 fprintf(log, "Accepted unauthenticated connection.\n");
-     }
-
-     return 0;
+    gss_buffer_desc send_tok, recv_tok;
+    gss_name_t client;
+    gss_OID doid;
+    OM_uint32 maj_stat, min_stat, acc_sec_min_stat;
+    gss_buffer_desc oid_name;
+    int     token_flags;
+
+    if (recv_token(s, &token_flags, &recv_tok) < 0)
+	return -1;
+
+    if (recv_tok.value) {
+	free(recv_tok.value);
+	recv_tok.value = NULL;
+    }
+
+    if (!(token_flags & TOKEN_NOOP)) {
+	if (log)
+	    fprintf(log, "Expected NOOP token, got %d token instead\n",
+		    token_flags);
+	return -1;
+    }
+
+    *context = GSS_C_NO_CONTEXT;
+
+    if (token_flags & TOKEN_CONTEXT_NEXT) {
+	do {
+	    if (recv_token(s, &token_flags, &recv_tok) < 0)
+		return -1;
+
+	    if (verbose && log) {
+		fprintf(log, "Received token (size=%d): \n",
+			(int) recv_tok.length);
+		print_token(&recv_tok);
+	    }
+
+	    maj_stat = gss_accept_sec_context(&acc_sec_min_stat, context, server_creds, &recv_tok, GSS_C_NO_CHANNEL_BINDINGS, &client, &doid, &send_tok, ret_flags, NULL,	/* ignore time_rec */
+					      NULL);	/* ignore del_cred_handle */
+
+	    if (recv_tok.value) {
+		free(recv_tok.value);
+		recv_tok.value = NULL;
+	    }
+
+	    if (send_tok.length != 0) {
+		if (verbose && log) {
+		    fprintf(log,
+			    "Sending accept_sec_context token (size=%d):\n",
+			    (int) send_tok.length);
+		    print_token(&send_tok);
+		}
+		if (send_token(s, TOKEN_CONTEXT, &send_tok) < 0) {
+		    if (log)
+			fprintf(log, "failure sending token\n");
+		    return -1;
+		}
+
+		(void) gss_release_buffer(&min_stat, &send_tok);
+	    }
+	    if (maj_stat != GSS_S_COMPLETE
+		&& maj_stat != GSS_S_CONTINUE_NEEDED) {
+		display_status("accepting context", maj_stat,
+			       acc_sec_min_stat);
+		if (*context != GSS_C_NO_CONTEXT)
+		    gss_delete_sec_context(&min_stat, context,
+					   GSS_C_NO_BUFFER);
+		return -1;
+	    }
+
+	    if (verbose && log) {
+		if (maj_stat == GSS_S_CONTINUE_NEEDED)
+		    fprintf(log, "continue needed...\n");
+		else
+		    fprintf(log, "\n");
+		fflush(log);
+	    }
+	} while (maj_stat == GSS_S_CONTINUE_NEEDED);
+
+	/* display the flags */
+	display_ctx_flags(*ret_flags);
+
+	if (verbose && log) {
+	    maj_stat = gss_oid_to_str(&min_stat, doid, &oid_name);
+	    if (maj_stat != GSS_S_COMPLETE) {
+		display_status("converting oid->string", maj_stat, min_stat);
+		return -1;
+	    }
+	    fprintf(log, "Accepted connection using mechanism OID %.*s.\n",
+		    (int) oid_name.length, (char *) oid_name.value);
+	    (void) gss_release_buffer(&min_stat, &oid_name);
+	}
+
+	maj_stat = gss_display_name(&min_stat, client, client_name, &doid);
+	if (maj_stat != GSS_S_COMPLETE) {
+	    display_status("displaying name", maj_stat, min_stat);
+	    return -1;
+	}
+	maj_stat = gss_release_name(&min_stat, &client);
+	if (maj_stat != GSS_S_COMPLETE) {
+	    display_status("releasing name", maj_stat, min_stat);
+	    return -1;
+	}
+    } else {
+	client_name->length = *ret_flags = 0;
+
+	if (log)
+	    fprintf(log, "Accepted unauthenticated connection.\n");
+    }
+
+    return 0;
 }
 
 /*
@@ -296,41 +290,43 @@ static int server_establish_context(s, server_creds, context, client_name,
  * A listening socket on the specified port and created and returned.
  * On error, an error message is displayed and -1 is returned.
  */
-static int create_socket(port)
-     u_short port;
+static int
+create_socket(port)
+    u_short port;
 {
-     struct sockaddr_in saddr;
-     int s;
-     int on = 1;
-     
-     saddr.sin_family = AF_INET;
-     saddr.sin_port = htons(port);
-     saddr.sin_addr.s_addr = INADDR_ANY;
-
-     if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
-	  perror("creating socket");
-	  return -1;
-     }
-     /* Let the socket be reused right away */
-     (void) setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *)&on, sizeof(on));
-     if (bind(s, (struct sockaddr *) &saddr, sizeof(saddr)) < 0) {
-	  perror("binding socket");
-	  (void) close(s);
-	  return -1;
-     }
-     if (listen(s, 5) < 0) {
-	  perror("listening on socket");
-	  (void) close(s);
-	  return -1;
-     }
-     return s;
+    struct sockaddr_in saddr;
+    int     s;
+    int     on = 1;
+
+    saddr.sin_family = AF_INET;
+    saddr.sin_port = htons(port);
+    saddr.sin_addr.s_addr = INADDR_ANY;
+
+    if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
+	perror("creating socket");
+	return -1;
+    }
+    /* Let the socket be reused right away */
+    (void) setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *) &on, sizeof(on));
+    if (bind(s, (struct sockaddr *) &saddr, sizeof(saddr)) < 0) {
+	perror("binding socket");
+	(void) close(s);
+	return -1;
+    }
+    if (listen(s, 5) < 0) {
+	perror("listening on socket");
+	(void) close(s);
+	return -1;
+    }
+    return s;
 }
 
-static float timeval_subtract(tv1, tv2)
-	struct timeval *tv1, *tv2;
+static float
+timeval_subtract(tv1, tv2)
+    struct timeval *tv1, *tv2;
 {
-	return ((tv1->tv_sec - tv2->tv_sec) +
-		((float) (tv1->tv_usec - tv2->tv_usec)) / 1000000);
+    return ((tv1->tv_sec - tv2->tv_sec) +
+	    ((float) (tv1->tv_usec - tv2->tv_usec)) / 1000000);
 }
 
 /*
@@ -338,47 +334,47 @@ static float timeval_subtract(tv1, tv2)
  * DO NOT REMOVE THIS UNTIL A BETTER TEST HAS BEEN WRITTEN, THOUGH.
  * 					-TYT
  */
-static int test_import_export_context(context)
-	gss_ctx_id_t *context;
+static int
+test_import_export_context(context)
+    gss_ctx_id_t *context;
 {
-	OM_uint32	min_stat, maj_stat;
-	gss_buffer_desc context_token, copied_token;
-	struct timeval tm1, tm2;
-	
-	/*
-	 * Attempt to save and then restore the context.
-	 */
-	gettimeofday(&tm1, (struct timezone *)0);
-	maj_stat = gss_export_sec_context(&min_stat, context, &context_token);
-	if (maj_stat != GSS_S_COMPLETE) {
-		display_status("exporting context", maj_stat, min_stat);
-		return 1;
-	}
-	gettimeofday(&tm2, (struct timezone *)0);
-	if (verbose && log)
-		fprintf(log, "Exported context: %d bytes, %7.4f seconds\n",
-			(int) context_token.length, 
-			timeval_subtract(&tm2, &tm1));
-	copied_token.length = context_token.length;
-	copied_token.value = malloc(context_token.length);
-	if (copied_token.value == 0) {
-	  if (log)
+    OM_uint32 min_stat, maj_stat;
+    gss_buffer_desc context_token, copied_token;
+    struct timeval tm1, tm2;
+
+    /*
+     * Attempt to save and then restore the context.
+     */
+    gettimeofday(&tm1, (struct timezone *) 0);
+    maj_stat = gss_export_sec_context(&min_stat, context, &context_token);
+    if (maj_stat != GSS_S_COMPLETE) {
+	display_status("exporting context", maj_stat, min_stat);
+	return 1;
+    }
+    gettimeofday(&tm2, (struct timezone *) 0);
+    if (verbose && log)
+	fprintf(log, "Exported context: %d bytes, %7.4f seconds\n",
+		(int) context_token.length, timeval_subtract(&tm2, &tm1));
+    copied_token.length = context_token.length;
+    copied_token.value = malloc(context_token.length);
+    if (copied_token.value == 0) {
+	if (log)
 	    fprintf(log, "Couldn't allocate memory to copy context token.\n");
-	  return 1;
-	}
-	memcpy(copied_token.value, context_token.value, copied_token.length);
-	maj_stat = gss_import_sec_context(&min_stat, &copied_token, context);
-	if (maj_stat != GSS_S_COMPLETE) {
-		display_status("importing context", maj_stat, min_stat);
-		return 1;
-	}
-	free(copied_token.value);
-	gettimeofday(&tm1, (struct timezone *)0);
-	if (verbose && log)
-		fprintf(log, "Importing context: %7.4f seconds\n",
-			timeval_subtract(&tm1, &tm2));
-	(void) gss_release_buffer(&min_stat, &context_token);
-	return 0;
+	return 1;
+    }
+    memcpy(copied_token.value, context_token.value, copied_token.length);
+    maj_stat = gss_import_sec_context(&min_stat, &copied_token, context);
+    if (maj_stat != GSS_S_COMPLETE) {
+	display_status("importing context", maj_stat, min_stat);
+	return 1;
+    }
+    free(copied_token.value);
+    gettimeofday(&tm1, (struct timezone *) 0);
+    if (verbose && log)
+	fprintf(log, "Importing context: %7.4f seconds\n",
+		timeval_subtract(&tm1, &tm2));
+    (void) gss_release_buffer(&min_stat, &context_token);
+    return 0;
 }
 
 /*
@@ -407,158 +403,157 @@ static int test_import_export_context(context)
  *
  * If any error occurs, -1 is returned.
  */
-static int sign_server(s, server_creds, export)
-     int s;
-     gss_cred_id_t server_creds;
-     int export;
+static int
+sign_server(s, server_creds, export)
+    int     s;
+    gss_cred_id_t server_creds;
+    int     export;
 {
     gss_buffer_desc client_name, xmit_buf, msg_buf;
     gss_ctx_id_t context;
     OM_uint32 maj_stat, min_stat;
-    int i, conf_state, ret_flags;
-    char	*cp;
-    int token_flags;
+    int     i, conf_state, ret_flags;
+    char   *cp;
+    int     token_flags;
 
     /* Establish a context with the client */
     if (server_establish_context(s, server_creds, &context,
-                                  &client_name, &ret_flags) < 0)
-        return(-1);
+				 &client_name, &ret_flags) < 0)
+	return (-1);
 
     if (context == GSS_C_NO_CONTEXT) {
-        printf("Accepted unauthenticated connection.\n");
-    }
-    else {
-        printf("Accepted connection: \"%.*s\"\n",
-                (int) client_name.length, (char *) client_name.value);
-        (void) gss_release_buffer(&min_stat, &client_name);
-
-        if (export) {
-            for (i=0; i < 3; i++)
-                if (test_import_export_context(&context))
-                    return -1;
-        }
+	printf("Accepted unauthenticated connection.\n");
+    } else {
+	printf("Accepted connection: \"%.*s\"\n",
+	       (int) client_name.length, (char *) client_name.value);
+	(void) gss_release_buffer(&min_stat, &client_name);
+
+	if (export) {
+	    for (i = 0; i < 3; i++)
+		if (test_import_export_context(&context))
+		    return -1;
+	}
     }
 
     do {
-        /* Receive the message token */
-        if (recv_token(s, &token_flags, &xmit_buf) < 0)
-            return(-1);
-
-        if (token_flags & TOKEN_NOOP) {
-            if (log)
-                fprintf(log, "NOOP token\n");
-            if(xmit_buf.value) {
-                free(xmit_buf.value);
-                xmit_buf.value = 0;
-            }
-            break;
-        }
-
-        if (verbose && log) {
-            fprintf(log, "Message token (flags=%d):\n", token_flags);
-            print_token(&xmit_buf);
-        }
-
-        if ((context == GSS_C_NO_CONTEXT) &&
-             (    token_flags & (TOKEN_WRAPPED|TOKEN_ENCRYPTED|TOKEN_SEND_MIC))) {
-            if (log)
-                fprintf(log,
-                         "Unauthenticated client requested authenticated services!\n");
-            if(xmit_buf.value) {
-                free (xmit_buf.value);
-                xmit_buf.value = 0;
-            }
-            return(-1);
-        }
-
-        if (token_flags & TOKEN_WRAPPED) {
-            maj_stat = gss_unwrap(&min_stat, context, &xmit_buf, &msg_buf,
-                                   &conf_state, (gss_qop_t *) NULL);
-            if (maj_stat != GSS_S_COMPLETE) {
-                display_status("unsealing message", maj_stat, min_stat);
-                if(xmit_buf.value) {
-                    free (xmit_buf.value);
-                    xmit_buf.value = 0;
-                }
-                return(-1);
-            } else if (! conf_state && (token_flags & TOKEN_ENCRYPTED)) {
-                fprintf(stderr, "Warning!  Message not encrypted.\n");
-            }
-
-            if(xmit_buf.value) {
-                free (xmit_buf.value);
-                xmit_buf.value = 0;
-            }
-        }
-        else {
-            msg_buf = xmit_buf;
-        }
-
-        if (log) {
-            fprintf(log, "Received message: ");
-            cp = msg_buf.value;
-            if ((isprint((int) cp[0]) || isspace((int) cp[0])) &&
-                 (isprint((int) cp[1]) || isspace((int) cp[1]))) {
-                fprintf(log, "\"%.*s\"\n", (int) msg_buf.length, 
-                         (char *) msg_buf.value);
-                 } else {
-                     fprintf(log, "\n");
-                     print_token(&msg_buf);
-                 }
-        }
-
-        if (token_flags & TOKEN_SEND_MIC) {
-            /* Produce a signature block for the message */
-            maj_stat = gss_get_mic(&min_stat, context, GSS_C_QOP_DEFAULT,
-                                    &msg_buf, &xmit_buf);
-            if (maj_stat != GSS_S_COMPLETE) {
-                display_status("signing message", maj_stat, min_stat);
-                return(-1);
-            }
-
-            if(msg_buf.value) {
-                free (msg_buf.value);
-                msg_buf.value = 0;
-            }
-
-            /* Send the signature block to the client */
-            if (send_token(s, TOKEN_MIC, &xmit_buf) < 0)
-                return(-1);
-
-            if(xmit_buf.value) {
-                free (xmit_buf.value);
-                xmit_buf.value = 0;
-            }
-        }
-        else {
-            if(msg_buf.value) {
-                free (msg_buf.value);
-                msg_buf.value = 0;
-            }
-            if (send_token(s, TOKEN_NOOP, empty_token) < 0)
-                return(-1);
-        }
-    } while (1 /* loop will break if NOOP received */);
+	/* Receive the message token */
+	if (recv_token(s, &token_flags, &xmit_buf) < 0)
+	    return (-1);
+
+	if (token_flags & TOKEN_NOOP) {
+	    if (log)
+		fprintf(log, "NOOP token\n");
+	    if (xmit_buf.value) {
+		free(xmit_buf.value);
+		xmit_buf.value = 0;
+	    }
+	    break;
+	}
+
+	if (verbose && log) {
+	    fprintf(log, "Message token (flags=%d):\n", token_flags);
+	    print_token(&xmit_buf);
+	}
+
+	if ((context == GSS_C_NO_CONTEXT) &&
+	    (token_flags & (TOKEN_WRAPPED | TOKEN_ENCRYPTED | TOKEN_SEND_MIC)))
+	{
+	    if (log)
+		fprintf(log,
+			"Unauthenticated client requested authenticated services!\n");
+	    if (xmit_buf.value) {
+		free(xmit_buf.value);
+		xmit_buf.value = 0;
+	    }
+	    return (-1);
+	}
+
+	if (token_flags & TOKEN_WRAPPED) {
+	    maj_stat = gss_unwrap(&min_stat, context, &xmit_buf, &msg_buf,
+				  &conf_state, (gss_qop_t *) NULL);
+	    if (maj_stat != GSS_S_COMPLETE) {
+		display_status("unsealing message", maj_stat, min_stat);
+		if (xmit_buf.value) {
+		    free(xmit_buf.value);
+		    xmit_buf.value = 0;
+		}
+		return (-1);
+	    } else if (!conf_state && (token_flags & TOKEN_ENCRYPTED)) {
+		fprintf(stderr, "Warning!  Message not encrypted.\n");
+	    }
+
+	    if (xmit_buf.value) {
+		free(xmit_buf.value);
+		xmit_buf.value = 0;
+	    }
+	} else {
+	    msg_buf = xmit_buf;
+	}
+
+	if (log) {
+	    fprintf(log, "Received message: ");
+	    cp = msg_buf.value;
+	    if ((isprint((int) cp[0]) || isspace((int) cp[0])) &&
+		(isprint((int) cp[1]) || isspace((int) cp[1]))) {
+		fprintf(log, "\"%.*s\"\n", (int) msg_buf.length,
+			(char *) msg_buf.value);
+	    } else {
+		fprintf(log, "\n");
+		print_token(&msg_buf);
+	    }
+	}
+
+	if (token_flags & TOKEN_SEND_MIC) {
+	    /* Produce a signature block for the message */
+	    maj_stat = gss_get_mic(&min_stat, context, GSS_C_QOP_DEFAULT,
+				   &msg_buf, &xmit_buf);
+	    if (maj_stat != GSS_S_COMPLETE) {
+		display_status("signing message", maj_stat, min_stat);
+		return (-1);
+	    }
+
+	    if (msg_buf.value) {
+		free(msg_buf.value);
+		msg_buf.value = 0;
+	    }
+
+	    /* Send the signature block to the client */
+	    if (send_token(s, TOKEN_MIC, &xmit_buf) < 0)
+		return (-1);
+
+	    if (xmit_buf.value) {
+		free(xmit_buf.value);
+		xmit_buf.value = 0;
+	    }
+	} else {
+	    if (msg_buf.value) {
+		free(msg_buf.value);
+		msg_buf.value = 0;
+	    }
+	    if (send_token(s, TOKEN_NOOP, empty_token) < 0)
+		return (-1);
+	}
+    } while (1 /* loop will break if NOOP received */ );
 
     if (context != GSS_C_NO_CONTEXT) {
-        /* Delete context */
-        maj_stat = gss_delete_sec_context(&min_stat, &context, NULL);
-        if (maj_stat != GSS_S_COMPLETE) {
-            display_status("deleting context", maj_stat, min_stat);
-            return(-1);
-        }
+	/* Delete context */
+	maj_stat = gss_delete_sec_context(&min_stat, &context, NULL);
+	if (maj_stat != GSS_S_COMPLETE) {
+	    display_status("deleting context", maj_stat, min_stat);
+	    return (-1);
+	}
     }
 
     if (log)
-        fflush(log);
+	fflush(log);
 
-    return(0);
+    return (0);
 }
 
 static int max_threads = 1;
 
 #ifdef _WIN32
-static thread_count = 0;
+static  thread_count = 0;
 static HANDLE hMutex = NULL;
 static HANDLE hEvent = NULL;
 
@@ -580,23 +575,23 @@ BOOL
 WaitAndIncrementThreadCounter(void)
 {
     for (;;) {
-        if (WaitForSingleObject(hMutex, INFINITE) == WAIT_OBJECT_0) {
-            if ( thread_count < max_threads ) {
-                thread_count++;
-                ReleaseMutex(hMutex);
-                return TRUE;
-            } else {
-                ReleaseMutex(hMutex);
-
-                if (WaitForSingleObject(hEvent, INFINITE) == WAIT_OBJECT_0) {
-                    continue;
-                } else {
-                    return FALSE;
-                }
-            }
-        } else {
-            return FALSE;
-        }
+	if (WaitForSingleObject(hMutex, INFINITE) == WAIT_OBJECT_0) {
+	    if (thread_count < max_threads) {
+		thread_count++;
+		ReleaseMutex(hMutex);
+		return TRUE;
+	    } else {
+		ReleaseMutex(hMutex);
+
+		if (WaitForSingleObject(hEvent, INFINITE) == WAIT_OBJECT_0) {
+		    continue;
+		} else {
+		    return FALSE;
+		}
+	    }
+	} else {
+	    return FALSE;
+	}
     }
 }
 
@@ -604,25 +599,26 @@ BOOL
 DecrementAndSignalThreadCounter(void)
 {
     if (WaitForSingleObject(hMutex, INFINITE) == WAIT_OBJECT_0) {
-        if ( thread_count == max_threads )
-            ResetEvent(hEvent);
-        thread_count--;
-        ReleaseMutex(hMutex);
-        return TRUE;
+	if (thread_count == max_threads)
+	    ResetEvent(hEvent);
+	thread_count--;
+	ReleaseMutex(hMutex);
+	return TRUE;
     } else {
-        return FALSE;
+	return FALSE;
     }
 }
 #endif
 
-struct _work_plan {
-    int             s;
-    gss_cred_id_t   server_creds;
-    int             export;
+struct _work_plan
+{
+    int     s;
+    gss_cred_id_t server_creds;
+    int     export;
 };
 
-void 
-worker_bee(void * param)
+void
+worker_bee(void *param)
 {
     struct _work_plan *work = (struct _work_plan *) param;
 
@@ -634,153 +630,163 @@ worker_bee(void * param)
     free(work);
 
 #ifdef _WIN32
-    if ( max_threads > 1 )
-        DecrementAndSignalThreadCounter();
+    if (max_threads > 1)
+	DecrementAndSignalThreadCounter();
 #endif
 }
 
 int
 main(argc, argv)
-     int argc;
-     char **argv;
+    int     argc;
+    char  **argv;
 {
-     char *service_name;
-     gss_cred_id_t server_creds;
-     OM_uint32 min_stat;
-     u_short port = 4444;
-     int once = 0;
-     int do_inetd = 0;
-     int export = 0;
-
-     log = stdout;
-     display_file = stdout;
-     argc--; argv++;
-     while (argc) {
-	  if (strcmp(*argv, "-port") == 0) {
-	       argc--; argv++;
-	       if (!argc) usage();
-	       port = atoi(*argv);
-	  } 
+    char   *service_name;
+    gss_cred_id_t server_creds;
+    OM_uint32 min_stat;
+    u_short port = 4444;
+    int     once = 0;
+    int     do_inetd = 0;
+    int     export = 0;
+
+    log = stdout;
+    display_file = stdout;
+    argc--;
+    argv++;
+    while (argc) {
+	if (strcmp(*argv, "-port") == 0) {
+	    argc--;
+	    argv++;
+	    if (!argc)
+		usage();
+	    port = atoi(*argv);
+	}
 #ifdef _WIN32
-          else if (strcmp(*argv, "-threads") == 0) {
-              argc--; argv++;
-              if (!argc) usage();
-              max_threads = atoi(*argv);
-          } 
+	else if (strcmp(*argv, "-threads") == 0) {
+	    argc--;
+	    argv++;
+	    if (!argc)
+		usage();
+	    max_threads = atoi(*argv);
+	}
 #endif
-          else if (strcmp(*argv, "-verbose") == 0) {
-	      verbose = 1;
-	  } else if (strcmp(*argv, "-once") == 0) {
-	      once = 1;
-	  } else if (strcmp(*argv, "-inetd") == 0) {
-	      do_inetd = 1;
-	  } else if (strcmp(*argv, "-export") == 0) {
-	      export = 1;
-	  } else if (strcmp(*argv, "-logfile") == 0) {
-	      argc--; argv++;
-	      if (!argc) usage();
-	      /* Gross hack, but it makes it unnecessary to add an
-                 extra argument to disable logging, and makes the code
-                 more efficient because it doesn't actually write data
-                 to /dev/null. */
-	      if (! strcmp(*argv, "/dev/null")) {
+	else if (strcmp(*argv, "-verbose") == 0) {
+	    verbose = 1;
+	} else if (strcmp(*argv, "-once") == 0) {
+	    once = 1;
+	} else if (strcmp(*argv, "-inetd") == 0) {
+	    do_inetd = 1;
+	} else if (strcmp(*argv, "-export") == 0) {
+	    export = 1;
+	} else if (strcmp(*argv, "-logfile") == 0) {
+	    argc--;
+	    argv++;
+	    if (!argc)
+		usage();
+	    /* Gross hack, but it makes it unnecessary to add an
+	     * extra argument to disable logging, and makes the code
+	     * more efficient because it doesn't actually write data
+	     * to /dev/null. */
+	    if (!strcmp(*argv, "/dev/null")) {
 		log = display_file = NULL;
-	      }
-	      else {
+	    } else {
 		log = fopen(*argv, "a");
 		display_file = log;
 		if (!log) {
-		  perror(*argv);
-		  exit(1);
+		    perror(*argv);
+		    exit(1);
 		}
-	      }
-	  } else
-	       break;
-	  argc--; argv++;
-     }
-     if (argc != 1)
-	  usage();
+	    }
+	} else
+	    break;
+	argc--;
+	argv++;
+    }
+    if (argc != 1)
+	usage();
 
-     if ((*argv)[0] == '-')
-	  usage();
+    if ((*argv)[0] == '-')
+	usage();
 
 #ifdef _WIN32
     if (max_threads < 1) {
-        fprintf(stderr, "warning: there must be at least one thread\n");
-        max_threads = 1;
+	fprintf(stderr, "warning: there must be at least one thread\n");
+	max_threads = 1;
     }
 
     if (max_threads > 1 && do_inetd)
-        fprintf(stderr, "warning: one thread may be used in conjunction with inetd\n");
+	fprintf(stderr,
+		"warning: one thread may be used in conjunction with inetd\n");
 
     InitHandles();
 #endif
 
-     service_name = *argv;
-
-     if (server_acquire_creds(service_name, &server_creds) < 0)
-	 return -1;
-     
-     if (do_inetd) {
-	 close(1);
-	 close(2);
-
-	 sign_server(0, server_creds, export);
-	 close(0);
-     } else {
-	 int stmp;
-
- 	 if ((stmp = create_socket(port)) >= 0) {
-             if (listen(stmp, max_threads == 1 ? 0 : max_threads) < 0)
-                 perror("listening on socket");
-
- 	     do {
-                 struct _work_plan * work = malloc(sizeof(struct _work_plan));
-
-                 if ( work == NULL ) {
-                     fprintf(stderr, "fatal error: out of memory");
-                     break;
-                 }
-
- 		 /* Accept a TCP connection */
-                 if ((work->s = accept(stmp, NULL, 0)) < 0) {
- 		     perror("accepting connection");
- 		     continue;
- 		 }
-                  
-                 work->server_creds = server_creds;
-                 work->export = export;
-
-                 if (max_threads == 1) {
-                     worker_bee((void *)work);
-                 } 
+    service_name = *argv;
+
+    if (server_acquire_creds(service_name, &server_creds) < 0)
+	return -1;
+
+    if (do_inetd) {
+	close(1);
+	close(2);
+
+	sign_server(0, server_creds, export);
+	close(0);
+    } else {
+	int     stmp;
+
+	if ((stmp = create_socket(port)) >= 0) {
+	    if (listen(stmp, max_threads == 1 ? 0 : max_threads) < 0)
+		perror("listening on socket");
+
+	    do {
+		struct _work_plan *work = malloc(sizeof(struct _work_plan));
+
+		if (work == NULL) {
+		    fprintf(stderr, "fatal error: out of memory");
+		    break;
+		}
+
+		/* Accept a TCP connection */
+		if ((work->s = accept(stmp, NULL, 0)) < 0) {
+		    perror("accepting connection");
+		    continue;
+		}
+
+		work->server_creds = server_creds;
+		work->export = export;
+
+		if (max_threads == 1) {
+		    worker_bee((void *) work);
+		}
 #ifdef _WIN32
-                 else {
-                     if ( WaitAndIncrementThreadCounter() ) {
-                         uintptr_t handle = _beginthread(worker_bee, 0, (void *)work);
-                         if (handle == (uintptr_t)-1) {
-                             closesocket(work->s);
-                             free(work);
-                         }
-                     } else {
-                         fprintf(stderr, "fatal error incrementing thread counter");
-                         closesocket(work->s);
-                         free(work);
-                         break;
-                     }
-                 }
+		else {
+		    if (WaitAndIncrementThreadCounter()) {
+			uintptr_t handle =
+			    _beginthread(worker_bee, 0, (void *) work);
+			if (handle == (uintptr_t) - 1) {
+			    closesocket(work->s);
+			    free(work);
+			}
+		    } else {
+			fprintf(stderr,
+				"fatal error incrementing thread counter");
+			closesocket(work->s);
+			free(work);
+			break;
+		    }
+		}
 #endif
- 	     } while (!once);
- 
- 	     closesocket(stmp);
- 	 }
-     }
+	    } while (!once);
+
+	    closesocket(stmp);
+	}
+    }
 
-     (void) gss_release_cred(&min_stat, &server_creds);
+    (void) gss_release_cred(&min_stat, &server_creds);
 
 #ifdef _WIN32
     CleanupHandles();
 #endif
 
-     return 0;
+    return 0;
 }