[pubcookie-dev] WEBISO CVS update: willey; verify_uwsecurid.c,NONE,1.1.2.1 flavor.c,1.11,1.11.2.1 config.h.in,2.16,2.16.2.1 verify.c,1.19,1.19.2.1

[Stephen Willey]

Update of /usr/local/cvsroot/webiso/pubcookie/src
 In directory webiso-cvs.cac.washington.edu:/var/tmp/cvs-serv12016
 
 Modified Files:
       Tag: UWash3
 	flavor.c config.h.in verify.c 
 Added Files:
       Tag: UWash3
 	flavor_uwsecurid.c verify_uwsecurid.c 
 Log Message:
 Flavor uwsecurid and it's verifier



Index: webiso/pubcookie/src/flavor.c
diff -c webiso/pubcookie/src/flavor.c:1.11 webiso/pubcookie/src/flavor.c:1.11.2.1
*** webiso/pubcookie/src/flavor.c:1.11	Wed Jul  2 21:25:21 2003
--- webiso/pubcookie/src/flavor.c	Tue Sep 23 11:49:02 2003
***************
*** 6,12 ****
  /** @file flavor.c
   * Flavor generic code
   *
!  * $Id: flavor.c,v 1.11 2003/07/03 04:25:21 willey Exp $
   */
  
  
--- 6,12 ----
  /** @file flavor.c
   * Flavor generic code
   *
!  * $Id: flavor.c,v 1.11.2.1 2003/09/23 18:49:02 willey Exp $
   */
  
  
***************
*** 26,40 ****
  #endif /* HAVE_DMALLOC_H */
  
  extern struct login_flavor login_flavor_basic;
- /* extern struct login_flavor login_flavor_uwash; */
  extern struct login_flavor login_flavor_getcred;
  
  /**
   */
  static struct login_flavor *flavors[] = {
      &login_flavor_basic,
      &login_flavor_getcred,
! /*    &login_flavor_uwash, */
      NULL
  }; /*! list of available flavors */
  
--- 26,40 ----
  #endif /* HAVE_DMALLOC_H */
  
  extern struct login_flavor login_flavor_basic;
  extern struct login_flavor login_flavor_getcred;
+ extern struct login_flavor login_flavor_uwsecurid;
  
  /**
   */
  static struct login_flavor *flavors[] = {
      &login_flavor_basic,
      &login_flavor_getcred,
!     &login_flavor_uwsecurid,
      NULL
  }; /*! list of available flavors */
  


Index: webiso/pubcookie/src/config.h.in
diff -c webiso/pubcookie/src/config.h.in:2.16 webiso/pubcookie/src/config.h.in:2.16.2.1
*** webiso/pubcookie/src/config.h.in:2.16	Thu May 29 15:02:10 2003
--- webiso/pubcookie/src/config.h.in	Tue Sep 23 11:49:02 2003
***************
*** 10,15 ****
--- 10,18 ----
  #undef ENABLE_LDAP
  
  /* Define to 1 to support shadow verifiers */
+ #undef ENABLE_UWSECURID
+ 
+ /* Define to 1 to support shadow verifiers */
  #undef ENABLE_SHADOW
  
  /* Define to 1 if you have the <arpa/inet.h> header file. */


Index: webiso/pubcookie/src/verify.c
diff -c webiso/pubcookie/src/verify.c:1.19 webiso/pubcookie/src/verify.c:1.19.2.1
*** webiso/pubcookie/src/verify.c:1.19	Wed Jul  2 21:25:21 2003
--- webiso/pubcookie/src/verify.c	Tue Sep 23 11:49:02 2003
***************
*** 6,12 ****
  /** @file verify.c
   * Verifier base stuff
   *
!  * $Id: verify.c,v 1.19 2003/07/03 04:25:21 willey Exp $
   */
  
  
--- 6,12 ----
  /** @file verify.c
   * Verifier base stuff
   *
!  * $Id: verify.c,v 1.19.2.1 2003/09/23 18:49:02 willey Exp $
   */
  
  
***************
*** 44,49 ****
--- 44,50 ----
  extern verifier ldap_verifier;
  extern verifier alwaystrue_verifier;
  extern verifier shadow_verifier;
+ extern verifier uwsecurid_verifier;
  
  /* verifiers that we actually compiled */
  static verifier *verifiers[] = {
***************
*** 52,57 ****
--- 53,59 ----
      &ldap_verifier,
      &alwaystrue_verifier,
      &shadow_verifier,
+     &uwsecurid_verifier,
      NULL
  };
  
***************
*** 99,105 ****
          exit(1);
      }
  
!     r = v->v(argv[2], argv[3], 
               argc > 4 ? argv[5] : NULL, 
               argc > 3 ? argv[4] : NULL,
               &creds, &errstr);
--- 101,108 ----
          exit(1);
      }
  
!     /* first arg is pool */
!     r = v->v(NULL, argv[2], argv[3], 
               argc > 4 ? argv[5] : NULL, 
               argc > 3 ? argv[4] : NULL,
               &creds, &errstr);
***************
*** 124,130 ****
          printf("\n"
                 "attempting to get imap/cyrus.andrew.cmu.edu credential...\n");
  
!         if (!v->cred_derive(creds, "vtest", "imap/cyrus.andrew.cmu.edu",
                              &newcreds) &&
              newcreds) {
              printf("got newcreds, size %d:\n", newcreds->sz);
--- 127,133 ----
          printf("\n"
                 "attempting to get imap/cyrus.andrew.cmu.edu credential...\n");
  
!         if (!v->cred_derive(NULL, creds, "vtest", "imap/cyrus.andrew.cmu.edu",
                              &newcreds) &&
              newcreds) {
              printf("got newcreds, size %d:\n", newcreds->sz);



end of message