(no subject)

[Nalin Dahyabhai]

>Submitter-Id:   net
>Originator:     
>Organization:
net
>Confidential:  no
>Synopsis:      unable to build 1.11.1p1 with gssapi/kserver support
>Severity:      non-critical
>Priority:      medium
>Category:      cvs
>Class:         sw-bug
>Release:       cvs-1.11.1p1
>Environment:
        
System: Linux blade.devel.redhat.com 2.4.3-12smp #1 SMP Fri Jun 8 14:38:50 EDT 
2001 i686 unknown
Architecture: i686

>Description:
        Unable to build 1.11.1p1 with gssapi/kserver support due to
        CVS_Username not being declared in server.c
>How-To-Repeat:
        configure with --with-krb4 or --with-gssapi, attempt to compile
>Fix:
        here's a short patch to 1.11.1p1:
--- cvs-1.11.1p1/src/server.c   Thu Apr 19 15:34:04 2001
+++ cvs-1.11.1p1/src/server.c   Tue Jun 19 17:37:04 2001
@@ -95,27 +95,31 @@
 #include <grp.h>
 #endif /* HAVE_INITGROUPS */
 
-# ifdef AUTH_SERVER_SUPPORT
+# if defined (HAVE_KERBEROS) || defined (AUTH_SERVER_SUPPORT) || defined 
(HAVE_GSSAPI)
 
 #   ifdef HAVE_GETSPNAM
 #     include <shadow.h>
 #   endif
 
 /* The cvs username sent by the client, which might or might not be
    the same as the system username the server eventually switches to
    run as.  CVS_Username gets set iff password authentication is
    successful. */
 char *CVS_Username = NULL;
+
+# ifdef AUTH_SERVER_SUPPORT
 
 /* Used to check that same repos is transmitted in pserver auth and in
    later CVS protocol.  Exported because root.c also uses. */
 static char *Pserver_Repos = NULL;
 
 /* Should we check for system usernames/passwords?  Can be changed by
    CVSROOT/config.  */
 int system_auth = 1;
 
 # endif /* AUTH_SERVER_SUPPORT */
+
+#endif /* HAVE_KERBEROS || AUTH_SERVER_SUPPORT || HAVE_GSSAPI */
 
 
 /* While processing requests, this buffer accumulates data to be sent to