aboutsummaryrefslogtreecommitdiff
path: root/src/appl/user_user
diff options
context:
space:
mode:
authorTom Yu <tlyu@mit.edu>2009-10-31 00:48:38 +0000
committerTom Yu <tlyu@mit.edu>2009-10-31 00:48:38 +0000
commit02d6bcbc98a214e7aeaaa9f45f0db8784a7b743b (patch)
tree61b9147863cd8be3eff63903dc36cae168254bd5 /src/appl/user_user
parent162ab371748cba0cc6f172419bd6e71fa04bb878 (diff)
downloadkrb5-02d6bcbc98a214e7aeaaa9f45f0db8784a7b743b.zip
krb5-02d6bcbc98a214e7aeaaa9f45f0db8784a7b743b.tar.gz
krb5-02d6bcbc98a214e7aeaaa9f45f0db8784a7b743b.tar.bz2
make mark-cstyle
make reindent git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23100 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/appl/user_user')
-rw-r--r--src/appl/user_user/client.c45
-rw-r--r--src/appl/user_user/server.c26
2 files changed, 35 insertions, 36 deletions
diff --git a/src/appl/user_user/client.c b/src/appl/user_user/client.c
index 6edf0ff..a2f8e7f 100644
--- a/src/appl/user_user/client.c
+++ b/src/appl/user_user/client.c
@@ -8,7 +8,7 @@
* require a specific license from the United States Government.
* It is the responsibility of any person or organization contemplating
* export to obtain such a license before exporting.
- *
+ *
* WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
* distribute this software and its documentation for any purpose and
* without fee is hereby granted, provided that the above copyright
@@ -22,7 +22,7 @@
* M.I.T. makes no representations about the suitability of
* this software for any purpose. It is provided "as is" without express
* or implied warranty.
- *
+ *
*
* Other end of user-user client/server pair.
*/
@@ -82,11 +82,11 @@ char *argv[];
}
if ((host = gethostbyname (argv[1])) == NULL) {
- fprintf (stderr, "uu-client: can't get address of host \"%s\".\n",
+ fprintf (stderr, "uu-client: can't get address of host \"%s\".\n",
argv[1]);
return 3;
}
-
+
if (host->h_addrtype != AF_INET) {
fprintf (stderr, "uu-client: bad address type %d for \"%s\".\n",
host->h_addrtype, argv[1]);
@@ -103,13 +103,13 @@ char *argv[];
cli_net_addr.sin_family = AF_INET;
cli_net_addr.sin_port = 0;
cli_net_addr.sin_addr.s_addr = 0;
- if (bind (s, (struct sockaddr *)&cli_net_addr,
+ if (bind (s, (struct sockaddr *)&cli_net_addr,
sizeof (cli_net_addr)) < 0) {
com_err ("uu-client", errno, "binding socket");
return 4;
}
}
-
+
serv_net_addr.sin_family = AF_INET;
serv_net_addr.sin_port = port;
@@ -120,10 +120,10 @@ char *argv[];
return 5;
}
- memcpy (&serv_net_addr.sin_addr, host->h_addr_list[i++],
+ memcpy (&serv_net_addr.sin_addr, host->h_addr_list[i++],
sizeof(serv_net_addr.sin_addr));
- if (connect(s, (struct sockaddr *)&serv_net_addr,
+ if (connect(s, (struct sockaddr *)&serv_net_addr,
sizeof (serv_net_addr)) == 0)
break;
com_err ("uu-client", errno, "connecting to \"%s\" (%s).",
@@ -146,12 +146,12 @@ char *argv[];
com_err("uu-client", retval, "getting principal name");
return 6;
}
-
+
retval = krb5_unparse_name(context, creds.client, &princ);
if (retval) {
com_err("uu-client", retval, "printing principal name");
return 7;
- }
+ }
else
fprintf(stderr, "uu-client: client principal is \"%s\".\n", princ);
@@ -161,7 +161,7 @@ char *argv[];
return 7;
}
- retval =
+ retval =
krb5_build_principal_ext(context, &creds.server,
krb5_princ_realm(context, creds.client)->length,
krb5_princ_realm(context, creds.client)->data,
@@ -173,9 +173,9 @@ char *argv[];
com_err("uu-client", retval, "setting up tgt server name");
return 7;
}
-
+
/* Get TGT from credentials cache */
- retval = krb5_get_credentials(context, KRB5_GC_CACHED, cc,
+ retval = krb5_get_credentials(context, KRB5_GC_CACHED, cc,
&creds, &new_creds);
if (retval) {
com_err("uu-client", retval, "getting TGT");
@@ -193,9 +193,9 @@ char *argv[];
com_err("uu-client", retval, "sending principal name to server");
return 8;
}
-
+
free(princ);
-
+
retval = krb5_write_message(context, (krb5_pointer) &s, &new_creds->ticket);
if (retval) {
com_err("uu-client", retval, "sending ticket to server");
@@ -213,8 +213,8 @@ char *argv[];
com_err("uu-client", retval, "initializing the auth_context");
return 9;
}
-
- retval =
+
+ retval =
krb5_auth_con_genaddrs(context, auth_context, s,
KRB5_AUTH_CONTEXT_GENERATE_LOCAL_FULL_ADDR |
KRB5_AUTH_CONTEXT_GENERATE_REMOTE_FULL_ADDR);
@@ -229,14 +229,14 @@ char *argv[];
com_err("uu-client", retval, "initializing the auth_context flags");
return 9;
}
-
- retval = krb5_auth_con_setuseruserkey(context, auth_context,
+
+ retval = krb5_auth_con_setuseruserkey(context, auth_context,
&new_creds->keyblock);
if (retval) {
com_err("uu-client", retval, "setting useruserkey for authcontext");
return 9;
}
-
+
#if 1
/* read the ap_req to get the session key */
retval = krb5_rd_req(context, &auth_context, &reply,
@@ -246,7 +246,7 @@ char *argv[];
retval = krb5_recvauth(context, &auth_context, (krb5_pointer)&s, "???",
0, /* server */, 0, NULL, &ticket);
#endif
-
+
if (retval) {
com_err("uu-client", retval, "reading AP_REQ from server");
return 9;
@@ -265,7 +265,7 @@ char *argv[];
com_err("uu-client", retval, "reading reply from server");
return 9;
}
-
+
retval = krb5_rd_safe(context, auth_context, &reply, &msg, NULL);
if (retval) {
com_err("uu-client", retval, "decoding reply from server");
@@ -275,4 +275,3 @@ char *argv[];
printf ("uu-client: server says \"%s\".\n", msg.data);
return 0;
}
-
diff --git a/src/appl/user_user/server.c b/src/appl/user_user/server.c
index 40243fe..8a66bbd 100644
--- a/src/appl/user_user/server.c
+++ b/src/appl/user_user/server.c
@@ -8,7 +8,7 @@
* require a specific license from the United States Government.
* It is the responsibility of any person or organization contemplating
* export to obtain such a license before exporting.
- *
+ *
* WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
* distribute this software and its documentation for any purpose and
* without fee is hereby granted, provided that the above copyright
@@ -22,7 +22,7 @@
* M.I.T. makes no representations about the suitability of
* this software for any purpose. It is provided "as is" without express
* or implied warranty.
- *
+ *
*
* One end of the user-user client-server pair.
*/
@@ -75,12 +75,12 @@ char *argv[];
int acc;
struct servent *sp;
socklen_t namelen = sizeof(f_inaddr);
-
+
if ((sock = socket(PF_INET, SOCK_STREAM, 0)) < 0) {
com_err("uu-server", errno, "creating socket");
exit(3);
}
-
+
l_inaddr.sin_family = AF_INET;
l_inaddr.sin_addr.s_addr = 0;
if (!(sp = getservbyname("uu-sample", "tcp"))) {
@@ -145,7 +145,7 @@ char *argv[];
printf ("uu-server: client ticket is %d bytes.\n",
creds.second_ticket.length);
- retval = krb5_get_credentials(context, KRB5_GC_USER_USER, cc,
+ retval = krb5_get_credentials(context, KRB5_GC_USER_USER, cc,
&creds, &new_creds);
if (retval) {
com_err("uu-server", retval, "getting user-user ticket");
@@ -182,8 +182,8 @@ char *argv[];
com_err("uu-server", retval, "initializing the auth_context flags");
return 8;
}
-
- retval =
+
+ retval =
krb5_auth_con_genaddrs(context, auth_context, sock,
KRB5_AUTH_CONTEXT_GENERATE_LOCAL_FULL_ADDR |
KRB5_AUTH_CONTEXT_GENERATE_REMOTE_FULL_ADDR);
@@ -191,10 +191,10 @@ char *argv[];
com_err("uu-server", retval, "generating addrs for auth_context");
return 9;
}
-
+
#if 1
- retval = krb5_mk_req_extended(context, &auth_context,
- AP_OPTS_USE_SESSION_KEY,
+ retval = krb5_mk_req_extended(context, &auth_context,
+ AP_OPTS_USE_SESSION_KEY,
NULL, new_creds, &msg);
if (retval) {
com_err("uu-server", retval, "making AP_REQ");
@@ -208,12 +208,12 @@ char *argv[];
#endif
if (retval)
goto cl_short_wrt;
-
+
free(msg.data);
-
+
msgtext.length = 32;
msgtext.data = "Hello, other end of connection.";
-
+
retval = krb5_mk_safe(context, auth_context, &msgtext, &msg, NULL);
if (retval) {
com_err("uu-server", retval, "encoding message to client");