Mark and reindent what's left of the appl directory

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

3 files changed, 177 insertions, 179 deletions

diff --git a/src/appl/simple/client/sim_client.c b/src/appl/simple/client/sim_client.c
index 4f5e403..57e4988 100644
--- a/src/appl/simple/client/sim_client.c
+++ b/src/appl/simple/client/sim_client.c
@@ -1,3 +1,4 @@
+/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
  * appl/simple/client/sim_client.c
  *
@@ -52,25 +53,22 @@
 #define MAXHOSTNAMELEN 64
 #endif
 
-#define MSG "hi there!"			/* message text */
+#define MSG "hi there!"                 /* message text */
 
 void usage (char *);
 
 void
-usage(name)
-    char *name;
+usage(char *name)
 {
-	fprintf(stderr, "usage: %s [-p port] [-h host] [-m message] [-s service] [host]\n", name);
+    fprintf(stderr, "usage: %s [-p port] [-h host] [-m message] [-s service] [host]\n", name);
 }
 
 int
-main(argc, argv)
-    int argc;
-    char *argv[];
+main(int argc, char *argv[])
 {
     int sock, i;
     unsigned int len;
-    int flags = 0;			/* flags for sendto() */
+    int flags = 0;                      /* flags for sendto() */
     struct servent *serv;
     struct hostent *host;
     char *cp;
@@ -78,11 +76,11 @@ main(argc, argv)
 #ifdef BROKEN_STREAMS_SOCKETS
     char my_hostname[MAXHOSTNAMELEN];
 #endif
-    struct sockaddr_in s_sock;		/* server address */
-    struct sockaddr_in c_sock;		/* client address */
+    struct sockaddr_in s_sock;          /* server address */
+    struct sockaddr_in c_sock;          /* client address */
     extern int opterr, optind;
     extern char * optarg;
-    int	ch;
+    int ch;
 
     short port = 0;
     char *message = MSG;
@@ -95,15 +93,15 @@ main(argc, argv)
     krb5_ccache ccdef;
     krb5_address addr, *portlocal_addr;
     krb5_rcache rcache;
-    krb5_data	rcache_name;
+    krb5_data   rcache_name;
 
-    krb5_context 	  context;
-    krb5_auth_context 	  auth_context = NULL;
+    krb5_context          context;
+    krb5_auth_context     auth_context = NULL;
 
     retval = krb5_init_context(&context);
     if (retval) {
-	    com_err(argv[0], retval, "while initializing krb5");
-	    exit(1);
+        com_err(argv[0], retval, "while initializing krb5");
+        exit(1);
     }
 
     progname = argv[0];
@@ -114,43 +112,43 @@ main(argc, argv)
      */
     opterr = 0;
     while ((ch = getopt(argc, argv, "p:m:h:s:")) != -1)
-    switch (ch) {
-    case 'p':
-	port = atoi(optarg);
-	break;
-    case 'm':
-	message = optarg;
-	break;
-    case 'h':
-	hostname = optarg;
-	break;
-    case 's':
-	service = optarg;
-	break;
-    case '?':
-    default:
-	usage(progname);
-	exit(1);
-	break;
-    }
+        switch (ch) {
+        case 'p':
+            port = atoi(optarg);
+            break;
+        case 'm':
+            message = optarg;
+            break;
+        case 'h':
+            hostname = optarg;
+            break;
+        case 's':
+            service = optarg;
+            break;
+        case '?':
+        default:
+            usage(progname);
+            exit(1);
+            break;
+        }
     argc -= optind;
     argv += optind;
     if (argc > 0) {
-	if (hostname)
-	    usage(progname);
-	hostname = argv[0];
+        if (hostname)
+            usage(progname);
+        hostname = argv[0];
     }
 
     if (hostname == 0) {
-	fprintf(stderr, "You must specify a hostname to contact.\n\n");
-	usage(progname);
-	exit(1);
+        fprintf(stderr, "You must specify a hostname to contact.\n\n");
+        usage(progname);
+        exit(1);
     }
 
     /* Look up server host */
     if ((host = gethostbyname(hostname)) == (struct hostent *) 0) {
-	fprintf(stderr, "%s: unknown host\n", hostname);
-	exit(1);
+        fprintf(stderr, "%s: unknown host\n", hostname);
+        exit(1);
     }
     strncpy(full_hname, host->h_name, sizeof(full_hname)-1);
     full_hname[sizeof(full_hname)-1] = '\0';
@@ -170,33 +168,33 @@ main(argc, argv)
     s_sock.sin_family = AF_INET;
 
     if (port == 0) {
-	/* Look up service */
-	if ((serv = getservbyname(SIMPLE_PORT, "udp")) == NULL) {
-	    fprintf(stderr, "service unknown: %s/udp\n", SIMPLE_PORT);
-	    exit(1);
-	}
-	s_sock.sin_port = serv->s_port;
+        /* Look up service */
+        if ((serv = getservbyname(SIMPLE_PORT, "udp")) == NULL) {
+            fprintf(stderr, "service unknown: %s/udp\n", SIMPLE_PORT);
+            exit(1);
+        }
+        s_sock.sin_port = serv->s_port;
     } else {
-	s_sock.sin_port = htons(port);
+        s_sock.sin_port = htons(port);
     }
 
     /* Open a socket */
     if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
-	com_err(progname, errno, "opening datagram socket");
-	exit(1);
+        com_err(progname, errno, "opening datagram socket");
+        exit(1);
     }
 
     memset(&c_sock, 0, sizeof(c_sock));
     c_sock.sin_family = AF_INET;
 #ifdef BROKEN_STREAMS_SOCKETS
     if (gethostname(my_hostname, sizeof(my_hostname)) < 0) {
-	perror("gethostname");
-	exit(1);
+        perror("gethostname");
+        exit(1);
     }
 
     if ((host = gethostbyname(my_hostname)) == (struct hostent *)0) {
-	fprintf(stderr, "%s: unknown host\n", hostname);
-	exit(1);
+        fprintf(stderr, "%s: unknown host\n", hostname);
+        exit(1);
     }
     memcpy(&c_sock.sin_addr, host->h_addr, sizeof(c_sock.sin_addr));
 #endif
@@ -204,8 +202,8 @@ main(argc, argv)
 
     /* Bind it to set the address; kernel will fill in port # */
     if (bind(sock, (struct sockaddr *)&c_sock, sizeof(c_sock)) < 0) {
-	com_err(progname, errno, "while binding datagram socket");
-	exit(1);
+        com_err(progname, errno, "while binding datagram socket");
+        exit(1);
     }
 
     /* PREPARE KRB_AP_REQ MESSAGE */
@@ -215,14 +213,14 @@ main(argc, argv)
 
     /* Get credentials for server */
     if ((retval = krb5_cc_default(context, &ccdef))) {
-	com_err(progname, retval, "while getting default ccache");
-	exit(1);
+        com_err(progname, retval, "while getting default ccache");
+        exit(1);
     }
 
     if ((retval = krb5_mk_req(context, &auth_context, 0, service, full_hname,
-			      &inbuf, ccdef, &packet))) {
-	com_err(progname, retval, "while preparing AP_REQ");
-	exit(1);
+                              &inbuf, ccdef, &packet))) {
+        com_err(progname, retval, "while preparing AP_REQ");
+        exit(1);
     }
     printf("Got credentials for %s.\n", service);
 
@@ -230,13 +228,13 @@ main(argc, argv)
        properly bound for getsockname() below. */
 
     if (connect(sock, (struct sockaddr *)&s_sock, sizeof(s_sock)) == -1) {
-	com_err(progname, errno, "while connecting to server");
-	exit(1);
+        com_err(progname, errno, "while connecting to server");
+        exit(1);
     }
     /* Send authentication info to server */
     if ((i = send(sock, (char *)packet.data, (unsigned) packet.length,
-		  flags)) < 0)
-	com_err(progname, errno, "while sending KRB_AP_REQ message");
+                  flags)) < 0)
+        com_err(progname, errno, "while sending KRB_AP_REQ message");
     printf("Sent authentication data: %d bytes\n", i);
     krb5_free_data_contents(context, &packet);
 
@@ -246,48 +244,48 @@ main(argc, argv)
     memset(&c_sock, 0, sizeof(c_sock));
     len = sizeof(c_sock);
     if (getsockname(sock, (struct sockaddr *)&c_sock, &len) < 0) {
-	com_err(progname, errno, "while getting socket name");
-	exit(1);
+        com_err(progname, errno, "while getting socket name");
+        exit(1);
     }
 
     addr.addrtype = ADDRTYPE_IPPORT;
     addr.length = sizeof(c_sock.sin_port);
     addr.contents = (krb5_octet *)&c_sock.sin_port;
     if ((retval = krb5_auth_con_setports(context, auth_context,
-					 &addr, NULL))) {
-	com_err(progname, retval, "while setting local port\n");
-	exit(1);
+                                         &addr, NULL))) {
+        com_err(progname, retval, "while setting local port\n");
+        exit(1);
     }
 
     addr.addrtype = ADDRTYPE_INET;
     addr.length = sizeof(c_sock.sin_addr);
     addr.contents = (krb5_octet *)&c_sock.sin_addr;
     if ((retval = krb5_auth_con_setaddrs(context, auth_context,
-					 &addr, NULL))) {
-	com_err(progname, retval, "while setting local addr\n");
-	exit(1);
+                                         &addr, NULL))) {
+        com_err(progname, retval, "while setting local addr\n");
+        exit(1);
     }
 
     /* THIS IS UGLY */
     if ((retval = krb5_gen_portaddr(context, &addr,
-				    (krb5_pointer) &c_sock.sin_port,
-				    &portlocal_addr))) {
-	com_err(progname, retval, "while generating port address");
-	exit(1);
+                                    (krb5_pointer) &c_sock.sin_port,
+                                    &portlocal_addr))) {
+        com_err(progname, retval, "while generating port address");
+        exit(1);
     }
 
     if ((retval = krb5_gen_replay_name(context,portlocal_addr,
-				       "_sim_clt",&cp))) {
-	com_err(progname, retval, "while generating replay cache name");
-	exit(1);
+                                       "_sim_clt",&cp))) {
+        com_err(progname, retval, "while generating replay cache name");
+        exit(1);
     }
 
     rcache_name.length = strlen(cp);
     rcache_name.data = cp;
 
     if ((retval = krb5_get_server_rcache(context, &rcache_name, &rcache))) {
-	com_err(progname, retval, "while getting server rcache");
-	exit(1);
+        com_err(progname, retval, "while getting server rcache");
+        exit(1);
     }
 
     /* set auth_context rcache */
@@ -298,14 +296,14 @@ main(argc, argv)
     inbuf.length = strlen(message);
 
     if ((retval = krb5_mk_safe(context, auth_context, &inbuf, &packet, NULL))){
-	com_err(progname, retval, "while making KRB_SAFE message");
-	exit(1);
+        com_err(progname, retval, "while making KRB_SAFE message");
+        exit(1);
     }
 
     /* Send it */
     if ((i = send(sock, (char *)packet.data, (unsigned) packet.length,
-		  flags)) < 0)
-	com_err(progname, errno, "while sending SAFE message");
+                  flags)) < 0)
+        com_err(progname, errno, "while sending SAFE message");
     printf("Sent checksummed message: %d bytes\n", i);
     krb5_free_data_contents(context, &packet);
 
@@ -313,22 +311,22 @@ main(argc, argv)
 
     /* Make the encrypted message */
     if ((retval = krb5_mk_priv(context, auth_context, &inbuf,
-			       &packet, NULL))) {
-	com_err(progname, retval, "while making KRB_PRIV message");
-	exit(1);
+                               &packet, NULL))) {
+        com_err(progname, retval, "while making KRB_PRIV message");
+        exit(1);
     }
 
     /* Send it */
     if ((i = send(sock, (char *)packet.data, (unsigned) packet.length,
-		  flags)) < 0)
-	com_err(progname, errno, "while sending PRIV message");
+                  flags)) < 0)
+        com_err(progname, errno, "while sending PRIV message");
     printf("Sent encrypted message: %d bytes\n", i);
     krb5_free_data_contents(context, &packet);
 
     retval = krb5_rc_destroy(context, rcache);
     if (retval) {
-	com_err(progname, retval, "while deleting replay cache");
-	exit(1);
+        com_err(progname, retval, "while deleting replay cache");
+        exit(1);
     }
     krb5_auth_con_setrcache(context, auth_context, NULL);
     krb5_auth_con_free(context, auth_context);
diff --git a/src/appl/simple/server/sim_server.c b/src/appl/simple/server/sim_server.c
index c82c6f3..d06c255 100644
--- a/src/appl/simple/server/sim_server.c
+++ b/src/appl/simple/server/sim_server.c
@@ -1,3 +1,4 @@
+/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
  * appl/simple/server/sim_server.c
  *
@@ -53,33 +54,30 @@
 #define PROGNAME argv[0]
 
 static void
-usage(name)
-    char *name;
+usage(char *name)
 {
-	fprintf(stderr, "usage: %s [-p port] [-s service] [-S keytab]\n", name);
+    fprintf(stderr, "usage: %s [-p port] [-s service] [-S keytab]\n", name);
 }
 
 int
-main(argc, argv)
-int argc;
-char *argv[];
+main(int argc, char *argv[])
 {
     int sock, i;
     unsigned int len;
-    int flags = 0;			/* for recvfrom() */
+    int flags = 0;                      /* for recvfrom() */
     int on = 1;
     struct servent *serv;
     struct hostent *host;
-    struct sockaddr_in s_sock;		/* server's address */
-    struct sockaddr_in c_sock;		/* client's address */
+    struct sockaddr_in s_sock;          /* server's address */
+    struct sockaddr_in c_sock;          /* client's address */
     char full_hname[MAXHOSTNAMELEN];
     char *cp;
     extern int opterr, optind;
     extern char * optarg;
-    int	ch;
+    int ch;
 
-    short port = 0;		/* If user specifies port */
-    krb5_keytab keytab = NULL;	/* Allow specification on command line */
+    short port = 0;             /* If user specifies port */
+    krb5_keytab keytab = NULL;  /* Allow specification on command line */
     char *service = SIMPLE_SERVICE;
 
     krb5_error_code retval;
@@ -93,8 +91,8 @@ char *argv[];
 
     retval = krb5_init_context(&context);
     if (retval) {
-	    com_err(argv[0], retval, "while initializing krb5");
-	    exit(1);
+        com_err(argv[0], retval, "while initializing krb5");
+        exit(1);
     }
 
     /*
@@ -102,33 +100,34 @@ char *argv[];
      *
      */
     opterr = 0;
-    while ((ch = getopt(argc, argv, "p:s:S:")) != -1)
-    switch (ch) {
-    case 'p':
-	port = atoi(optarg);
-	break;
-    case 's':
-	service = optarg;
-	break;
-    case 'S':
-	if ((retval = krb5_kt_resolve(context, optarg, &keytab))) {
-	    com_err(PROGNAME, retval,
-		    "while resolving keytab file %s", optarg);
-	    exit(2);
-	}
-	break;
-
-    case '?':
-    default:
-	usage(PROGNAME);
-	exit(1);
-	break;
+    while ((ch = getopt(argc, argv, "p:s:S:")) != -1) {
+        switch (ch) {
+        case 'p':
+            port = atoi(optarg);
+            break;
+        case 's':
+            service = optarg;
+            break;
+        case 'S':
+            if ((retval = krb5_kt_resolve(context, optarg, &keytab))) {
+                com_err(PROGNAME, retval,
+                        "while resolving keytab file %s", optarg);
+                exit(2);
+            }
+            break;
+
+        case '?':
+        default:
+            usage(PROGNAME);
+            exit(1);
+            break;
+        }
     }
 
     if ((retval = krb5_sname_to_principal(context, NULL, service,
-					  KRB5_NT_SRV_HST, &sprinc))) {
-	com_err(PROGNAME, retval, "while generating service name %s", service);
-	exit(1);
+                                          KRB5_NT_SRV_HST, &sprinc))) {
+        com_err(PROGNAME, retval, "while generating service name %s", service);
+        exit(1);
     }
 
     /* Set up server address */
@@ -136,41 +135,41 @@ char *argv[];
     s_sock.sin_family = AF_INET;
 
     if (port == 0) {
-	/* Look up service */
-	if ((serv = getservbyname(SIMPLE_PORT, "udp")) == NULL) {
-	    fprintf(stderr, "service unknown: %s/udp\n", SIMPLE_PORT);
-	    exit(1);
-	}
-	s_sock.sin_port = serv->s_port;
+        /* Look up service */
+        if ((serv = getservbyname(SIMPLE_PORT, "udp")) == NULL) {
+            fprintf(stderr, "service unknown: %s/udp\n", SIMPLE_PORT);
+            exit(1);
+        }
+        s_sock.sin_port = serv->s_port;
     } else {
-	s_sock.sin_port = htons(port);
+        s_sock.sin_port = htons(port);
     }
 
     if (gethostname(full_hname, sizeof(full_hname)) < 0) {
-	perror("gethostname");
-	exit(1);
+        perror("gethostname");
+        exit(1);
     }
 
     if ((host = gethostbyname(full_hname)) == (struct hostent *)0) {
-	fprintf(stderr, "%s: host unknown\n", full_hname);
-	exit(1);
+        fprintf(stderr, "%s: host unknown\n", full_hname);
+        exit(1);
     }
     memcpy(&s_sock.sin_addr, host->h_addr, sizeof(s_sock.sin_addr));
 
     /* Open socket */
     if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
-	perror("opening datagram socket");
-	exit(1);
+        perror("opening datagram socket");
+        exit(1);
     }
 
-     /* Let the socket be reused right away */
-     (void) setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *)&on,
-		       sizeof(on));
+    /* Let the socket be reused right away */
+    (void) setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *)&on,
+                      sizeof(on));
 
     /* Bind the socket */
     if (bind(sock, (struct sockaddr *)&s_sock, sizeof(s_sock))) {
-	perror("binding datagram socket");
-	exit(1);
+        perror("binding datagram socket");
+        exit(1);
     }
 
 #ifdef DEBUG
@@ -182,9 +181,9 @@ char *argv[];
     /* use "recvfrom" so we know client's address */
     len = sizeof(struct sockaddr_in);
     if ((i = recvfrom(sock, (char *)pktbuf, sizeof(pktbuf), flags,
-		 (struct sockaddr *)&c_sock, &len)) < 0) {
-	perror("receiving datagram");
-	exit(1);
+                      (struct sockaddr *)&c_sock, &len)) < 0) {
+        perror("receiving datagram");
+        exit(1);
     }
 
     printf("Received %d bytes\n", i);
@@ -193,14 +192,14 @@ char *argv[];
 
     /* Check authentication info */
     if ((retval = krb5_rd_req(context, &auth_context, &packet,
-			      sprinc, keytab, NULL, &ticket))) {
-	com_err(PROGNAME, retval, "while reading request");
-	exit(1);
+                              sprinc, keytab, NULL, &ticket))) {
+        com_err(PROGNAME, retval, "while reading request");
+        exit(1);
     }
     if ((retval = krb5_unparse_name(context, ticket->enc_part2->client,
-				    &cp))) {
-	com_err(PROGNAME, retval, "while unparsing client name");
-	exit(1);
+                                    &cp))) {
+        com_err(PROGNAME, retval, "while unparsing client name");
+        exit(1);
     }
     printf("Got authentication info from %s\n", cp);
     free(cp);
@@ -210,8 +209,8 @@ char *argv[];
     addr.length = sizeof(c_sock.sin_addr);
     addr.contents = (krb5_octet *)&c_sock.sin_addr;
     if ((retval = krb5_auth_con_setaddrs(context, auth_context,
-					 NULL, &addr))) {
-	com_err(PROGNAME, retval, "while setting foreign addr");
+                                         NULL, &addr))) {
+        com_err(PROGNAME, retval, "while setting foreign addr");
         exit(1);
     }
 
@@ -219,8 +218,8 @@ char *argv[];
     addr.length = sizeof(c_sock.sin_port);
     addr.contents = (krb5_octet *)&c_sock.sin_port;
     if ((retval = krb5_auth_con_setports(context, auth_context,
-					 NULL, &addr))) {
-	com_err(PROGNAME, retval, "while setting foreign port");
+                                         NULL, &addr))) {
+        com_err(PROGNAME, retval, "while setting foreign port");
         exit(1);
     }
 
@@ -229,9 +228,9 @@ char *argv[];
     /* use "recvfrom" so we know client's address */
     len = sizeof(struct sockaddr_in);
     if ((i = recvfrom(sock, (char *)pktbuf, sizeof(pktbuf), flags,
-		 (struct sockaddr *)&c_sock, &len)) < 0) {
-	perror("receiving datagram");
-	exit(1);
+                      (struct sockaddr *)&c_sock, &len)) < 0) {
+        perror("receiving datagram");
+        exit(1);
     }
 #ifdef DEBUG
     printf("&c_sock.sin_addr is %s\n", inet_ntoa(c_sock.sin_addr));
@@ -242,9 +241,9 @@ char *argv[];
     packet.data = (krb5_pointer) pktbuf;
 
     if ((retval = krb5_rd_safe(context, auth_context, &packet,
-			       &message, NULL))) {
-	com_err(PROGNAME, retval, "while verifying SAFE message");
-	exit(1);
+                               &message, NULL))) {
+        com_err(PROGNAME, retval, "while verifying SAFE message");
+        exit(1);
     }
     printf("Safe message is: '%.*s'\n", (int) message.length, message.data);
 
@@ -255,9 +254,9 @@ char *argv[];
     /* use "recvfrom" so we know client's address */
     len = sizeof(struct sockaddr_in);
     if ((i = recvfrom(sock, (char *)pktbuf, sizeof(pktbuf), flags,
-		      (struct sockaddr *)&c_sock, &len)) < 0) {
-	perror("receiving datagram");
-	exit(1);
+                      (struct sockaddr *)&c_sock, &len)) < 0) {
+        perror("receiving datagram");
+        exit(1);
     }
     printf("Received %d bytes\n", i);
 
@@ -265,12 +264,12 @@ char *argv[];
     packet.data = (krb5_pointer) pktbuf;
 
     if ((retval = krb5_rd_priv(context, auth_context, &packet,
-			       &message, NULL))) {
-	com_err(PROGNAME, retval, "while verifying PRIV message");
-	exit(1);
+                               &message, NULL))) {
+        com_err(PROGNAME, retval, "while verifying PRIV message");
+        exit(1);
     }
     printf("Decrypted message is: '%.*s'\n", (int) message.length,
-	   message.data);
+           message.data);
 
     krb5_auth_con_free(context, auth_context);
     krb5_free_context(context);
diff --git a/src/appl/simple/simple.h b/src/appl/simple/simple.h
index bbee794..8d8f176 100644
--- a/src/appl/simple/simple.h
+++ b/src/appl/simple/simple.h
@@ -1,3 +1,4 @@
+/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
  * appl/simple/simple.h
  *
@@ -28,5 +29,5 @@
  * server & client applications.
  */
 
-#define SIMPLE_SERVICE	"sample"
-#define SIMPLE_PORT	"sample"
+#define SIMPLE_SERVICE  "sample"
+#define SIMPLE_PORT     "sample"