Removed all references to DECLARG and OLDDECLARG.

Added krb5_context to all krb5_*() routines.

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

3 files changed, 26 insertions, 18 deletions

diff --git a/src/appl/sample/sclient/ChangeLog b/src/appl/sample/sclient/ChangeLog
index 438dd5d79..45b44540a 100644
--- a/src/appl/sample/sclient/ChangeLog
+++ b/src/appl/sample/sclient/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jan 13 15:23:47 1995  Chris Provenzano (proven@mit.edu)
+
+    * Added krb5_context to all krb5_routines
+
 Mon Oct  3 19:16:02 1994  Theodore Y. Ts'o  (tytso@dcl)
 
 	* Makefile.in: Use $(srcdir) to find manual page for make install.
diff --git a/src/appl/sample/sclient/sclient.c b/src/appl/sample/sclient/sclient.c
index 53e40fa5b..e9629d6aa 100644
--- a/src/appl/sample/sclient/sclient.c
+++ b/src/appl/sample/sclient/sclient.c
@@ -51,6 +51,7 @@ char *argv[];
     struct hostent *hp;
     struct sockaddr_in sin, lsin;
     int sock, namelen;
+    krb5_context context;
     krb5_data recv_data;
     krb5_checksum send_cksum;
     krb5_error_code retval;
@@ -65,7 +66,8 @@ char *argv[];
 	exit(1);
     }
 
-    krb5_init_ets();
+    krb5_init_context(& context);
+    krb5_init_ets(context);
 
     (void) signal(SIGPIPE, SIG_IGN);
     if (!valid_cksumtype(CKSUMTYPE_CRC32)) {
@@ -100,7 +102,7 @@ char *argv[];
 	exit(1);
     }
 
-    if (retval = krb5_sname_to_principal(argv[1], SAMPLE_SERVICE,
+    if (retval = krb5_sname_to_principal(context, argv[1], SAMPLE_SERVICE,
 					 KRB5_NT_SRV_HST, &server)) {
 	com_err(argv[0], retval, "while creating server name for %s",
 		argv[1]);
@@ -137,12 +139,12 @@ char *argv[];
 
     /* compute checksum, using CRC-32 */
     if (!(send_cksum.contents = (krb5_octet *)
-	  malloc(krb5_checksum_size(CKSUMTYPE_CRC32)))) {
+	  malloc(krb5_checksum_size(context, CKSUMTYPE_CRC32)))) {
 	com_err(argv[0], ENOMEM, "while allocating checksum");
 	exit(1);
     }
     /* choose some random stuff to compute checksum from */
-    if (retval = krb5_calculate_checksum(CKSUMTYPE_CRC32,
+    if (retval = krb5_calculate_checksum(context, CKSUMTYPE_CRC32,
 					 argv[1],
 					 strlen(argv[1]),
 					 0,
@@ -153,16 +155,16 @@ char *argv[];
 	exit(1);
     }
 
-    if (retval = krb5_cc_default(&ccdef)) {
+    if (retval = krb5_cc_default(context, &ccdef)) {
 	com_err(argv[0], retval, "while getting default ccache");
 	exit(1);
     }
 
-    if (retval = krb5_cc_get_principal(ccdef, &client)) {
+    if (retval = krb5_cc_get_principal(context, ccdef, &client)) {
 	com_err(argv[0], retval, "while getting client principal name");
 	exit(1);
     }
-    retval = krb5_sendauth((krb5_pointer) &sock,
+    retval = krb5_sendauth(context, (krb5_pointer) &sock,
 			   SAMPLE_VERSION, client, server,
 			   AP_OPTS_MUTUAL_REQUIRED,
 			   &send_cksum,
@@ -173,7 +175,7 @@ char *argv[];
 			   &err_ret,
 			   &rep_ret);
 
-    krb5_free_principal(server);	/* finished using it */
+    krb5_free_principal(context, server);	/* finished using it */
 
     if (retval && retval != KRB5_SENDAUTH_REJECTED) {
 	com_err(argv[0], retval, "while using sendauth");
@@ -186,7 +188,7 @@ char *argv[];
     } else if (rep_ret) {
 	/* got a reply */
 	printf("sendauth succeeded, reply is:\n");
-	if ((retval = krb5_net_read(sock, (char *)&xmitlen,
+	if ((retval = krb5_net_read(context, sock, (char *)&xmitlen,
 				    sizeof(xmitlen))) <= 0) {
 	    if (retval == 0)
 		errno = ECONNABORTED;
@@ -199,7 +201,7 @@ char *argv[];
 		    "while allocating buffer to read from server");
 	    exit(1);
 	}
-	if ((retval = krb5_net_read(sock, (char *)recv_data.data,
+	if ((retval = krb5_net_read(context, sock, (char *)recv_data.data,
 				    recv_data.length)) <= 0) {
 	    if (retval == 0)
 		errno = ECONNABORTED;
diff --git a/src/appl/sample/sserver/sserver.c b/src/appl/sample/sserver/sserver.c
index 37d463a72..ed5e4bb8f 100644
--- a/src/appl/sample/sserver/sserver.c
+++ b/src/appl/sample/sserver/sserver.c
@@ -57,6 +57,7 @@ main(argc, argv)
 int argc;
 char *argv[];
 {
+    krb5_context context;
     struct sockaddr_in peername;
     krb5_address peeraddr;
     int namelen = sizeof(peername);
@@ -68,13 +69,14 @@ char *argv[];
     char repbuf[BUFSIZ];
     char *cname;
 
-    krb5_init_ets();
-    /* open a log connection */
+    krb5_init_context(&context);
+    krb5_init_ets(context);
 
+    /* open a log connection */
     openlog("sserver", 0, LOG_DAEMON);
 
-    if (retval = krb5_sname_to_principal(NULL, SAMPLE_SERVICE, KRB5_NT_SRV_HST,
-					 &server)) {
+    if (retval = krb5_sname_to_principal(context, NULL, SAMPLE_SERVICE, 
+					 KRB5_NT_SRV_HST, &server)) {
 	syslog(LOG_ERR, "while generating service name (%s): %s",
 	       SAMPLE_SERVICE, error_message(retval));
 	exit(1);
@@ -126,7 +128,7 @@ char *argv[];
     peeraddr.length = sizeof(peername.sin_addr);
     peeraddr.contents = (krb5_octet *)&peername.sin_addr;
 
-    if (retval = krb5_recvauth((krb5_pointer)&sock,
+    if (retval = krb5_recvauth(context, (krb5_pointer)&sock,
 			       SAMPLE_VERSION, server, &peeraddr,
 			       0, 0, 0,	/* no fetchfrom, keyproc or arg */
 			       0,	/* default rc type */
@@ -140,7 +142,7 @@ char *argv[];
 	exit(1);
     }
 
-    if (retval = krb5_unparse_name(client, &cname)) {
+    if (retval = krb5_unparse_name(context, client, &cname)) {
 	syslog(LOG_ERR, "unparse failed: %s", error_message(retval));
 	cname = "<unparse error>";
     }
@@ -151,12 +153,12 @@ char *argv[];
     xmitlen = htons(strlen(repbuf));
     recv_data.length = strlen(repbuf);
     recv_data.data = repbuf;
-    if ((retval = krb5_net_write(0, (char *)&xmitlen,
+    if ((retval = krb5_net_write(context, 0, (char *)&xmitlen,
 				 sizeof(xmitlen))) < 0) {
 	syslog(LOG_ERR, "%m: while writing len to client");
 	exit(1);
     }
-    if ((retval = krb5_net_write(0, (char *)recv_data.data,
+    if ((retval = krb5_net_write(context, 0, (char *)recv_data.data,
 				 recv_data.length)) < 0) {
 	syslog(LOG_ERR, "%m: while writing data to client");
 	exit(1);