Removed or commented out my error log trace statements. mod_auth_sspi_1.0.5beta
authorJames Van Lommel <jamesvl@gmail.com>
Thu Jun 05 16:29:18 2008 -0700 (5 months ago)
changeset 53bca53a8d467
parent 49ce2bd078485
child 6d04e94cfd8d2
Removed or commented out my error log trace statements.

They were in place mainly to help me understand how Apache worked with the module.
src/authentication.c
src/mod_auth_sspi.c
       1 --- a/src/authentication.c	Thu Jun 05 16:28:18 2008 -0700
       2 +++ b/src/authentication.c	Thu Jun 05 16:29:18 2008 -0700
       3 @@ -497,26 +497,7 @@
       4   */
       5  static int ie_post_needs_reauth(const sspi_auth_ctx* ctx) {
       6  
       7 -    //const apr_array_header_t *hdrs_arr = apr_table_elts(ctx->r->headers_in);
       8 -    //const apr_table_entry_t *hdrs = (const apr_table_entry_t *) hdrs_arr->elts;
       9 -    //int i;
      10     const char* contentLen = apr_table_get(ctx->r->headers_in, "Content-Length");
      11 -
      12 -   ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ctx->r->server,
      13 -                 "SSPI_jvl:    > checking IE Post for invalid token: %s, %s",
      14 -                 ctx->r->method,
      15 -                 apr_table_get(ctx->r->headers_in, "Content-Length")
      16 -               );
      17 -
      18 -    /*
      19 -    for (i = 0; i < hdrs_arr->nelts; ++i) {
      20 -        if (!hdrs[i].key)
      21 -            continue;
      22 -        //apr_file_printf(f, "%s: %s\n", hdrs[i].key, hdrs[i].val);
      23 -        ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ctx->r->server,
      24 -                "SSPI_jvl:    >    key: %s  val: %s", hdrs[i].key, hdrs[i].val);
      25 -    }
      26 -    */
      27  
      28     if (lstrcmpi(ctx->r->method, "POST") == 0 &&
      29           lstrcmpi(contentLen, "0") == 0 &&
      30 @@ -614,10 +595,6 @@
      31      sspi_auth_ctx ctx;
      32      int res;
      33  
      34 -    ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, r->server,
      35 -                 "SSPI_jvl: Made it to authenticate_sspi_user, req type: %s",
      36 -                 r->protocol);
      37 -
      38  #ifdef _DEBUG
      39      if (sspiModuleInfo.currentlyDebugging == FALSE) {
      40          sspiModuleInfo.currentlyDebugging = TRUE;
      41 @@ -660,11 +637,6 @@
      42          ctx.crec->sspi_packages = ctx.crec->sspi_package_basic;
      43      }
      44  
      45 -
      46 -    ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, r->server,
      47 -                 "SSPI_jvl:    retrieving user data via key:  %s",
      48 -                 sspiModuleInfo.userDataKeyString);
      49 -
      50      /** Get our SSPI_connection_record from the APR connection pool. */
      51      // does the userDataKeyString need to change per user/connection?
      52      apr_pool_userdata_get(&ctx.scr, sspiModuleInfo.userDataKeyString,
      53 @@ -674,11 +646,6 @@
      54       * save it to our connection pool.
      55       */
      56      if (ctx.scr == NULL) {
      57 -
      58 -        ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, r->server,
      59 -                 "SSPI_jvl:    failed to find user data via key:  %s",
      60 -                 sspiModuleInfo.userDataKeyString);
      61 -
      62          ctx.scr = apr_pcalloc(r->connection->pool, sizeof(sspi_connection_rec));
      63          apr_pool_userdata_setn(ctx.scr, sspiModuleInfo.userDataKeyString,
      64            cleanup_sspi_connection, r->connection->pool);
      65 @@ -694,8 +661,10 @@
      66              ctx.scr->server_context.dwLower = 0;
      67              ctx.scr->server_context.dwUpper = 0;
      68  
      69 +            /*
      70              ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, r->server,
      71                "SSPI_jvl:    starting IE reauth");
      72 +            */
      73          }
      74      }
      75  
      76 @@ -704,21 +673,15 @@
      77      //  context creation or if something went wrong.)
      78      if (ctx.scr->username == NULL) {
      79          if (res = get_sspi_header(&ctx)) {
      80 -           ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, r->server,
      81 -                 "SSPI_jvl:    returning after get_sspi_header()");
      82              return res;
      83          }
      84  
      85          if ((! ctx.scr->have_credentials) && (res = obtain_credentials(&ctx))) {
      86 -           ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, r->server,
      87 -                 "SSPI_jvl:    returning because could not obtain credentials");
      88              return res;
      89          }
      90  
      91          if (ctx.hdr.authtype == typeSSPI) {
      92              if (res = accept_security_context(&ctx)) {
      93 -                 ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, r->server,
      94 -                   "SSPI_jvl:    returning because could not accept_security_ctx");
      95                  return res;
      96              }
      97          } else if (ctx.hdr.authtype == typeBasic) {
      98 @@ -729,15 +692,9 @@
      99              /* don't forget to clean up open user password */
     100              SecureZeroMemory(&ctx.hdr, sizeof(ctx.hdr));
     101              if (res) {
     102 -
     103 -                 ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, r->server,
     104 -                 "SSPI_jvl:    returning because could not pass cleartext auth");
     105                  return res;
     106              }
     107          }
     108 -
     109 -        ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, r->server,
     110 -                 "SSPI_jvl:    Made it through sspi credential checks");
     111  
     112          /* we should stick with per-request auth - per connection
     113           * would be difficult to code such that
     114 @@ -745,9 +702,6 @@
     115           * referred to images in another directory).
     116           */
     117          if (ctx.crec->sspi_per_request_auth) {
     118 -            ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, r->server,
     119 -                 "SSPI_jvl:   per_request_auth is on; cleaning up pools");
     120 -
     121              apr_pool_cleanup_kill(r->connection->pool, ctx.scr,
     122                cleanup_sspi_connection);
     123              apr_pool_cleanup_register(r->pool, ctx.scr, cleanup_sspi_connection,
     124 @@ -759,10 +713,5 @@
     125          return res;
     126      }
     127  
     128 -    ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, r->server,
     129 -                 "SSPI_jvl: Found user data via key; username:  %s",
     130 -                 ctx.scr->username);
     131 -
     132 -
     133      return OK;
     134  }
     1.1 --- a/src/mod_auth_sspi.c	Thu Jun 05 16:28:18 2008 -0700
     1.2 +++ b/src/mod_auth_sspi.c	Thu Jun 05 16:29:18 2008 -0700
     1.3 @@ -117,9 +117,11 @@
     1.4            -1, sspiModuleInfo.userDataKeyString, UUID_STRING_LEN, NULL, NULL);
     1.5          CoUninitialize();
     1.6  
     1.7 +        /*
     1.8          ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, s,
     1.9                   "SSPI_jvl: generating GUID for userDataKey... %s",
    1.10                   sspiModuleInfo.userDataKeyString);
    1.11 +        */
    1.12  
    1.13          /* 5. Determine the name of the security support provider DLL for this
    1.14                platform. */