[CalendarServer-changes] [123] PyKerberos/trunk/src

[source_changes at macosforge.org]

Revision: 123
Author:   wsanchez at apple.com
Date:     2006-09-11 16:15:53 -0700 (Mon, 11 Sep 2006)

Log Message:
-----------
Printf cleanups.
Submitted by agx at honk.sigxcpu.org
Reviewed by wsanchez

Modified Paths:
--------------
    PyKerberos/trunk/src/kerberosbasic.c
    PyKerberos/trunk/src/kerberosgss.c

Modified: PyKerberos/trunk/src/kerberosbasic.c
===================================================================
--- PyKerberos/trunk/src/kerberosbasic.c	2006-09-11 23:07:35 UTC (rev 122)
+++ PyKerberos/trunk/src/kerberosbasic.c	2006-09-11 23:15:53 UTC (rev 123)
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <string.h>
 
-/*#define PRINTFS*/
+#undef PRINTFS
 
 static krb5_error_code verify_krb5_user(krb5_context context, krb5_principal principal, const char *password, krb5_principal server);
 
@@ -39,7 +39,7 @@
 	if (code)
 	{
 #ifdef PRINTFS
-		printf("Cannot initialize Kerberos5 context (%d)", code);
+		printf("Cannot initialize Kerberos5 context (%d)\n", code);
 #endif
 		return 0;
 	}
@@ -49,7 +49,7 @@
 	if (ret)
 	{
 #ifdef PRINTFS
-		printf("Error parsing server name (%s): %s", service, krb5_get_err_text(kcontext, ret));
+		printf("Error parsing server name (%s): %s\n", service, krb5_get_err_text(kcontext, ret));
 #endif
 		ret = 0;
 		goto end;
@@ -59,13 +59,13 @@
 	if (code)
 	{
 #ifdef PRINTFS
-		printf("krb5_unparse_name() failed: %s", krb5_get_err_text(kcontext, code));
+		printf("krb5_unparse_name() failed: %s\n", krb5_get_err_text(kcontext, code));
 #endif
 		ret = 0;
 		goto end;
 	}
 #ifdef PRINTFS
-	printf("Using %s as server principal for password verification", name);
+	printf("Using %s as server principal for password verification\n", name);
 #endif
 	free(name);
 	name = NULL;
@@ -85,7 +85,7 @@
 	if (code)
 	{
 #ifdef PRINTFS
-		printf("krb5_parse_name() failed: %s", krb5_get_err_text(kcontext, code));
+		printf("krb5_parse_name() failed: %s\n", krb5_get_err_text(kcontext, code));
 #endif
 		ret = 0;
 		goto end;
@@ -103,7 +103,7 @@
 	
 end:
 #ifdef PRINTFS
-	printf("kerb_authenticate_user_krb5pwd ret=%d user=%s authtype=%s", ret, user, "Basic");
+	printf("kerb_authenticate_user_krb5pwd ret=%d user=%s authtype=%s\n", ret, user, "Basic");
 #endif
 	if (name)
 		free(name);
@@ -130,7 +130,7 @@
 	if (ret == 0)
 	{
 #ifdef PRINTFS
-		printf("Trying to get TGT for user %s", name);
+		printf("Trying to get TGT for user %s\n", name);
 #endif
 		free(name);
 	}
@@ -139,7 +139,7 @@
 	if (ret)
 	{
 #ifdef PRINTFS
-		printf("krb5_get_init_creds_password() failed: %s",  krb5_get_err_text(context, ret));
+		printf("krb5_get_init_creds_password() failed: %s\n",  krb5_get_err_text(context, ret));
 #endif
 		goto end;
 	}

Modified: PyKerberos/trunk/src/kerberosgss.c
===================================================================
--- PyKerberos/trunk/src/kerberosgss.c	2006-09-11 23:07:35 UTC (rev 122)
+++ PyKerberos/trunk/src/kerberosgss.c	2006-09-11 23:15:53 UTC (rev 123)
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#define PRINTFS
+#undef PRINTFS
 
 static const char *get_gss_error(char *p, int psize, OM_uint32 err_maj, OM_uint32 err_min, char *prefix);
 
@@ -31,7 +31,9 @@
 {
 	OM_uint32 maj_stat;
 	OM_uint32 min_stat;
+#ifdef PRINTFS
 	char buf[1024];
+#endif
 	gss_buffer_desc name_token = GSS_C_EMPTY_BUFFER;
 	int ret = AUTH_GSS_COMPLETE;
 
@@ -87,7 +89,9 @@
 {
 	OM_uint32 maj_stat;
 	OM_uint32 min_stat;
+#ifdef PRINTFS
 	char buf[1024];
+#endif
 	gss_buffer_desc input_token = GSS_C_EMPTY_BUFFER;
 	gss_buffer_desc output_token = GSS_C_EMPTY_BUFFER;
 	int ret = AUTH_GSS_CONTINUE;
@@ -189,7 +193,9 @@
 {
 	OM_uint32 maj_stat;
 	OM_uint32 min_stat;
+#ifdef PRINTFS
 	char buf[1024];
+#endif
 	gss_buffer_desc name_token = GSS_C_EMPTY_BUFFER;
 	int ret = AUTH_GSS_COMPLETE;
 	
@@ -267,7 +273,9 @@
 {
 	OM_uint32 maj_stat;
 	OM_uint32 min_stat;
+#ifdef PRINTFS
 	char buf[1024];
+#endif
 	gss_buffer_desc input_token = GSS_C_EMPTY_BUFFER;
 	gss_buffer_desc output_token = GSS_C_EMPTY_BUFFER;
 	int ret = AUTH_GSS_CONTINUE;

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20060911/bff8121a/attachment.html