[pubcookie-dev] CVS update: jjminer; webiso/pubcookie/src index.cgi.c,1.164,1.165

[miner at doit.wisc.edu]

Update of /usr/local/cvsroot/webiso/pubcookie/src
 In directory webiso-cvs.cac.washington.edu:/var/tmp/cvs-serv10168/src
 
 Modified Files:
 	index.cgi.c 
 Log Message:
 
     Moved the free()ing of altconfig to after the logging was initialized so
     that we can print a debug message telling which logfile we are using.
 



Index: webiso/pubcookie/src/index.cgi.c
diff -c webiso/pubcookie/src/index.cgi.c:1.164 webiso/pubcookie/src/index.cgi.c:1.165
*** webiso/pubcookie/src/index.cgi.c:1.164	Fri Oct  7 11:59:57 2005
--- webiso/pubcookie/src/index.cgi.c	Fri Oct  7 15:17:54 2005
***************
*** 18,24 ****
  /** @file index.cgi.c
   * Login server CGI
   *
!  * $Id: index.cgi.c,v 1.164 2005/10/07 18:59:57 jjminer Exp $
   */
  
  #ifdef WITH_FCGI
--- 18,24 ----
  /** @file index.cgi.c
   * Login server CGI
   *
!  * $Id: index.cgi.c,v 1.165 2005/10/07 22:17:54 jjminer Exp $
   */
  
  #ifdef WITH_FCGI
***************
*** 2015,2025 ****
  
      libpbc_config_init (p, altconfig, "logincgi");
  
-     if (altconfig != NULL)
-         pbc_free (p, altconfig);
- 
      debug = libpbc_config_getint (p, "debug", 0);
      pbc_log_init_syslog (p, "pubcookie login server");
      get_kiosk_parameters (p);
      if (libpbc_pubcookie_init (p, &context) == PBC_FAIL)
          abend (p, "Initialization failed");
--- 2015,2028 ----
  
      libpbc_config_init (p, altconfig, "logincgi");
  
      debug = libpbc_config_getint (p, "debug", 0);
      pbc_log_init_syslog (p, "pubcookie login server");
+ 
+     if ( altconfig != NULL ) {
+         pbc_log_activity (p, PBC_LOG_DEBUG_LOW, "Using Non-standard config: %s", altconfig );
+         pbc_free( p, altconfig );
+     }
+ 
      get_kiosk_parameters (p);
      if (libpbc_pubcookie_init (p, &context) == PBC_FAIL)
          abend (p, "Initialization failed");



end of message