===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sudo/Attic/defaults.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** src/usr.bin/sudo/Attic/defaults.c	1999/11/18 16:29:01	1.1
--- src/usr.bin/sudo/Attic/defaults.c	1999/12/10 06:45:11	1.2
***************
*** 53,59 ****
  #include "sudo.h"
  
  #ifndef lint
! static const char rcsid[] = "$Sudo: defaults.c,v 1.12 1999/11/05 22:11:55 millert Exp $";
  #endif /* lint */
  
  /*
--- 53,59 ----
  #include "sudo.h"
  
  #ifndef lint
! static const char rcsid[] = "$Sudo: defaults.c,v 1.13 1999/12/02 20:31:24 millert Exp $";
  #endif /* lint */
  
  /*
***************
*** 166,174 ****
  	"log_year", T_FLAG, { 0 },
  	"Log the year in the (non-syslog) log file"
      }, {
- 	"shell_noargs", T_FLAG, { 0 },
- 	"If sudo is invoked with no arguments, start a shell"
-     }, {
  	"set_home", T_FLAG, { 0 },
  	"Set $HOME to the target user when starting a shell with -s"
      }, {
--- 166,171 ----
***************
*** 321,328 ****
      int op;     /* TRUE or FALSE */
  {
      struct sudo_defs_types *cur;
  
!     for (cur = sudo_defs_table; cur->name; cur++) {
  	if (strcmp(var, cur->name) == 0)
  	    break;
      }
--- 318,326 ----
      int op;     /* TRUE or FALSE */
  {
      struct sudo_defs_types *cur;
+     int num;
  
!     for (cur = sudo_defs_table, num = 0; cur->name; cur++, num++) {
  	if (strcmp(var, cur->name) == 0)
  	    break;
      }
***************
*** 425,430 ****
--- 423,432 ----
  		return(FALSE);
  	    }
  	    cur->sd_un.flag = op;
+ 
+ 	    /* Special action for I_FQDN.  Move to own switch if we get more */
+ 	    if (num == I_FQDN && op)
+ 		set_fqdn();
  	    break;
      }
  
***************
*** 490,498 ****
  #ifdef HOST_IN_LOG
      def_flag(I_LOG_HOST) = TRUE;
  #endif
- #ifdef SHELL_IF_NO_ARGS
-     def_flag(I_SHELL_NOARGS) = TRUE;
- #endif
  #ifdef SHELL_SETS_HOME
      def_flag(I_SET_HOME) = TRUE;
  #endif
--- 492,497 ----
***************
*** 615,627 ****
  	return(FALSE);				/* not found */
  
      /* Store both name and number. */
!     if (def->sd_un.str)
  	free(def->sd_un.str);
      def->sd_un.str = estrdup(fac->name);
      sudo_defs_table[I_LOGFAC].sd_un.ival = fac->num;
  #else
!     if (def->sd_un.str)
  	free(def->sd_un.str);
      def->sd_un.str = estrdup("default");
  #endif /* LOG_NFACILITIES */
      return(TRUE);
--- 614,632 ----
  	return(FALSE);				/* not found */
  
      /* Store both name and number. */
!     if (def->sd_un.str) {
  	free(def->sd_un.str);
+ 	closelog();
+     }
+     openlog("sudo", 0, fac->num);
      def->sd_un.str = estrdup(fac->name);
      sudo_defs_table[I_LOGFAC].sd_un.ival = fac->num;
  #else
!     if (def->sd_un.str) {
  	free(def->sd_un.str);
+ 	closelog();
+     }
+     openlog("sudo", 0);
      def->sd_un.str = estrdup("default");
  #endif /* LOG_NFACILITIES */
      return(TRUE);