remove logging calls

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/raeburn-gssapi-cfx@15852 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/rpc/auth_gssapi.c b/src/lib/rpc/auth_gssapi.c
index 6545d32826e5f1f462868a2334d9efbe4add0abb..a18939ae697d34a0cc009ae05d5c72c9b2e57fb3 100644 (file)
--- a/src/lib/rpc/auth_gssapi.c
+++ b/src/lib/rpc/auth_gssapi.c
@@ -581,13 +581,11 @@ static bool_t auth_gssapi_marshall(auth, xdrs)
          
          PRINTF(("gssapi_marshall: sending seq_num %d\n", seq_num));
          
-         _log("%s:%d: in %s\n", SFILE, __LINE__, __func__);
          if (auth_gssapi_seal_seq(AUTH_PRIVATE(auth)->context, seq_num,
                                   &out_buf) == FALSE) {
               PRINTF(("gssapi_marhshall: seal failed\n"));
          }
-         _log("%s:%d: in %s\n", SFILE, __LINE__, __func__);
-
+         
          auth->ah_verf.oa_base = out_buf.value;
          auth->ah_verf.oa_length = out_buf.length;
          

diff --git a/src/lib/rpc/auth_gssapi_misc.c b/src/lib/rpc/auth_gssapi_misc.c
index 28896b3eeddbb1c48e9f9c91b240105787e12285..ab9b0bcbca8a5e0083cbeaf35ab7fc97618d821a 100644 (file)
--- a/src/lib/rpc/auth_gssapi_misc.c
+++ b/src/lib/rpc/auth_gssapi_misc.c
@@ -97,12 +97,8 @@ bool_t auth_gssapi_seal_seq(context, seq_num, out_buf)
      
      in_buf.length = sizeof(rpc_u_int32);
      in_buf.value = (char *) &nl_seq_num;
-     _log("%s:%d: %s about to call gss_seal\n", SFILE, __LINE__,
-         __func__);
      gssstat = gss_seal(&minor_stat, context, 0, GSS_C_QOP_DEFAULT,
                        &in_buf, NULL, out_buf);
-     _log("%s:%d: %s result %d/%d in_buf %d out_buf %d\n", __FILE__, __LINE__,
-         __func__, gssstat, minor_stat, in_buf.length, out_buf->length);
      if (gssstat != GSS_S_COMPLETE) {
          PRINTF(("gssapi_seal_seq: failed\n"));
          AUTH_GSSAPI_DISPLAY_STATUS(("sealing sequence number",
@@ -123,9 +119,6 @@ bool_t auth_gssapi_unseal_seq(context, in_buf, seq_num)
      
      gssstat = gss_unseal(&minor_stat, context, in_buf, &out_buf,
                          NULL, NULL);
-     _log("%s:%d: %s input len %d result %d/%d len %d\n",
-         __FILE__, __LINE__, __func__, in_buf->length,
-         gssstat, minor_stat, out_buf.length);
      if (gssstat != GSS_S_COMPLETE) {
          PRINTF(("gssapi_unseal_seq: failed\n"));
          AUTH_GSSAPI_DISPLAY_STATUS(("unsealing sequence number",

diff --git a/src/lib/rpc/clnt_tcp.c b/src/lib/rpc/clnt_tcp.c
index d422079a0983b73d96c13675cb09fc0fbcfc02e0..9906bca0e9a2f1aa479f8217aef51fdfe8af8094 100644 (file)
--- a/src/lib/rpc/clnt_tcp.c
+++ b/src/lib/rpc/clnt_tcp.c
@@ -440,7 +440,6 @@ readtcp(ctptr, buf, len)
                return (0);
 
 #endif /* def FD_SETSIZE */
-#define SFILE (strrchr(__FILE__,'/') ? 1+strrchr(__FILE__,'/') : __FILE__)
        while (TRUE) {
                readfds = mask;
                tout = ct->ct_wait;
@@ -448,8 +447,6 @@ readtcp(ctptr, buf, len)
                               &tout)) {
                case 0:
                        ct->ct_error.re_status = RPC_TIMEDOUT;
-                       _log("%s:%d: %s select says 0\n", SFILE, __LINE__, __func__);
-           if (fork() == 0) abort();
                        return (-1);
 
                case -1:
@@ -457,8 +454,6 @@ readtcp(ctptr, buf, len)
                                continue;
                        ct->ct_error.re_status = RPC_CANTRECV;
                        ct->ct_error.re_errno = errno;
-                       _log("%s:%d: %s select says error %d/%s\n", SFILE, __LINE__, __func__,
-                            errno, error_message(errno));
                        return (-1);
                }
                break;
@@ -466,7 +461,6 @@ readtcp(ctptr, buf, len)
        switch (len = read(ct->ct_sock, buf, (size_t) len)) {
 
        case 0:
-           _log("%s:%d: %s %d bytes\n", SFILE, __LINE__, __func__, len);
                /* premature eof */
                ct->ct_error.re_errno = ECONNRESET;
                ct->ct_error.re_status = RPC_CANTRECV;
@@ -474,12 +468,9 @@ readtcp(ctptr, buf, len)
                break;
 
        case -1:
-           _log("%s:%d: %s %d bytes\n", SFILE, __LINE__, __func__, len);
                ct->ct_error.re_errno = errno;
                ct->ct_error.re_status = RPC_CANTRECV;
                break;
-       default:
-           _log("%s:%d: %s %d bytes\n", SFILE, __LINE__, __func__, len);
        }
        return (len);
 }
@@ -495,12 +486,10 @@ writetcp(ctptr, buf, len)
 
        for (cnt = len; cnt > 0; cnt -= i, buf += i) {
                if ((i = write(ct->ct_sock, buf, (size_t) cnt)) == -1) {
-           _log("%s:%d: %s %d bytes\n", SFILE, __LINE__, __func__, len);
                        ct->ct_error.re_errno = errno;
                        ct->ct_error.re_status = RPC_CANTSEND;
                        return (-1);
                }
-           _log("%s:%d: %s %d bytes\n", SFILE, __LINE__, __func__, len);
        }
        return (len);
 }

diff --git a/src/lib/rpc/rpc_callmsg.c b/src/lib/rpc/rpc_callmsg.c
index f9072be8b1b5af6d67c76cec3218dc5cafc68df6..831f2fd2da8a9058bbc885342b2d9ba217527546 100644 (file)
--- a/src/lib/rpc/rpc_callmsg.c
+++ b/src/lib/rpc/rpc_callmsg.c
@@ -87,8 +87,6 @@ xdr_callmsg(xdrs, cmsg)
                                buf += RNDUP(oa->oa_length) / sizeof (rpc_int32);
                        }
                        oa = &cmsg->rm_call.cb_verf;
-                       _log("%s:%d: packing: oa->oa_flavor=%d oa_length=%d\n",
-                            __FILE__, __LINE__, oa->oa_flavor, oa->oa_length);
                        IXDR_PUT_ENUM(buf, oa->oa_flavor);
                        IXDR_PUT_LONG(buf, oa->oa_length);
                        if (oa->oa_length) {
@@ -155,8 +153,6 @@ xdr_callmsg(xdrs, cmsg)
                                oa->oa_flavor = IXDR_GET_ENUM(buf, enum_t);
                                oa->oa_length = IXDR_GET_LONG(buf);
                        }
-                       _log("%s:%d: unpacked: oa->oa_flavor=%d oa_length=%d\n",
-                            __FILE__, __LINE__, oa->oa_flavor, oa->oa_length);
                        if (oa->oa_length) {
                                if (oa->oa_length > MAX_AUTH_BYTES) {
                                        return (FALSE);

diff --git a/src/lib/rpc/svc.c b/src/lib/rpc/svc.c
index ad3cd5bebfc34beea6fcee33d82220db5ea059ac..9026815415bff9f1bf5f0750730a6082ce9985ca 100644 (file)
--- a/src/lib/rpc/svc.c
+++ b/src/lib/rpc/svc.c
@@ -457,9 +457,6 @@ svc_getreqset(readfds)
                                no_dispatch = FALSE;
 
                                /* first authenticate the message */
-                               _log("%s:%d: msg.cb_verf.oa_length=%d, oa_flavor=%d\n",
-                                    __FILE__, __LINE__, msg.rm_call.cb_verf.oa_length,
-                                    msg.rm_call.cb_verf.oa_flavor);
                                why=_authenticate(&r, &msg, &no_dispatch);
                                if (why != AUTH_OK) {
                                     svcerr_auth(xprt, why);

diff --git a/src/lib/rpc/svc_auth.c b/src/lib/rpc/svc_auth.c
index e52e4722b09a794159a9193cf0fd6b4949f854f6..2e28b5c059137b05499b0d15555ad865fca0d46f 100644 (file)
--- a/src/lib/rpc/svc_auth.c
+++ b/src/lib/rpc/svc_auth.c
@@ -93,8 +93,6 @@ _authenticate(rqst, msg, no_dispatch)
        rqst->rq_xprt->xp_verf.oa_length = 0;
        cred_flavor = rqst->rq_cred.oa_flavor;
        *no_dispatch = FALSE;
-       _log("%s:%d: dispatching authentication flavor %d\n",
-            __FILE__, __LINE__, cred_flavor);
        for (i = 0; i < svcauthnum; i++) {
             if (cred_flavor == svcauthsw[i].flavor &&
                 svcauthsw[i].authenticator != NULL) {

diff --git a/src/lib/rpc/svc_auth_gssapi.c b/src/lib/rpc/svc_auth_gssapi.c
index 41a3311f6238ff729527ebb89dbfdc6731485b3d..8458bf4733d5d37e17568a489158a23e704886c2 100644 (file)
--- a/src/lib/rpc/svc_auth_gssapi.c
+++ b/src/lib/rpc/svc_auth_gssapi.c
@@ -137,7 +137,6 @@ enum auth_stat _gssrpc_svcauth_gssapi(rqst, msg, no_dispatch)
      rpc_u_int32 seq_num;
 
      PRINTF(("svcauth_gssapi: starting\n"));
-     _log("%s:%d: svcauth_gssapi starting\n", __FILE__, __LINE__);
      
      /* clean up expired entries */
      clean_client();
@@ -183,7 +182,6 @@ enum auth_stat _gssrpc_svcauth_gssapi(rqst, msg, no_dispatch)
 #ifdef DEBUG_GSSAPI
      if (svc_debug_gssapi) {
          if (creds.auth_msg && rqst->rq_proc == AUTH_GSSAPI_EXIT) {
-      _log("%s:%d: %s AUTH_GSSAPI_EXIT\n", SFILE, __LINE__, __func__);
               PRINTF(("svcauth_gssapi: GSSAPI_EXIT, cleaning up\n"));
               svc_sendreply(rqst->rq_xprt, xdr_void, NULL);
               gssrpc_xdr_free(xdr_authgssapi_creds, &creds);
@@ -444,7 +442,6 @@ enum auth_stat _gssrpc_svcauth_gssapi(rqst, msg, no_dispatch)
               PRINTF(("svcauth_gssapi: context established, isn %d\n", 
                       client_data->seq_num));
 
-              _log("%s:%d: in %s\n", SFILE, __LINE__, __func__);
               if (auth_gssapi_seal_seq(client_data->context,
                                        client_data->seq_num,
                                        &call_res.signed_isn) ==
@@ -454,7 +451,6 @@ enum auth_stat _gssrpc_svcauth_gssapi(rqst, msg, no_dispatch)
                    gss_release_buffer(&minor_stat, &output_token);
                    goto error;
               }
-              _log("%s:%d: in %s\n", SFILE, __LINE__, __func__);
          }
 
          PRINTF(("svcauth_gssapi: sending reply\n"));
@@ -512,14 +508,12 @@ enum auth_stat _gssrpc_svcauth_gssapi(rqst, msg, no_dispatch)
          
          /* prepare response verifier */
          seq_num = client_data->seq_num + 1;
-         _log("%s:%d: in %s\n", SFILE, __LINE__, __func__);
          if (auth_gssapi_seal_seq(client_data->context, seq_num,
                                   &out_buf) == FALSE) {
               ret = AUTH_FAILED;
               LOG_MISCERR("internal error sealing sequence number");
               goto error;
          }
-         _log("%s:%d: in %s\n", SFILE, __LINE__, __func__);
          
          client_data->seq_num++;
          

diff --git a/src/lib/rpc/xdr_rec.c b/src/lib/rpc/xdr_rec.c
index 251d7718fa5ec818b8cf61dc5dcfa0d7cec1a2fa..28faaf24c6b74bb233ffe7fd480a8a4e5faa641c 100644 (file)
--- a/src/lib/rpc/xdr_rec.c
+++ b/src/lib/rpc/xdr_rec.c
@@ -538,8 +538,6 @@ get_input_bytes(rstrm, addr, len)
 {
        register size_t current;
 
-#define SFILE (strrchr(__FILE__,'/') ? 1+strrchr(__FILE__,'/') : __FILE__)
-       _log("%s:%d: %s wants %d bytes\n", SFILE, __LINE__, __func__, len);
        while (len > 0) {
                current = (size_t)((long)rstrm->in_boundry - 
                                (long)rstrm->in_finger);