--- cvs-1.11.1p1.org/src/login.c	Thu Sep  6 18:18:29 2001
+++ cvs-1.11.1p1/src/login.c	Wed Dec 11 15:19:42 2002
@@ -7,6 +7,7 @@
  * Allow user to log in for an authenticating server.
  */
 
+#include <sys/stat.h>
 #include "cvs.h"
 #include "getline.h"
 
@@ -30,7 +31,7 @@
 #endif
 
 #ifndef CVS_PASSWORD_FILE 
-#define CVS_PASSWORD_FILE ".cvspass"
+#define CVS_PASSWORD_FILE "cvspass"
 #endif
 
 /* If non-NULL, get_cvs_password() will just return this. */
@@ -44,6 +45,8 @@
 {
     char *homedir;
     char *passfile;
+    char *path;
+    struct stat st;
 
     /* Environment should override file. */
     if ((passfile = getenv ("CVS_PASSFILE")) != NULL)
@@ -65,8 +68,17 @@
 	return (char *) NULL;
     }
 
+    if ( (path=getenv("CONFIG_DIR")) && path[0] ) {
+	path=(char*) malloc(strlen(homedir)+strlen(getenv("CONFIG_DIR"))+2);
+	sprintf(path, "%s/%s", homedir, getenv("CONFIG_DIR"));
+    } else path=(char *) NULL;
+    if ( path && stat(path,&st)!=-1 && S_ISDIR(st.st_mode) ) {
+	passfile = (char *) xmalloc (strlen (path) + strlen (CVS_PASSWORD_FILE) + 3);
+	sprintf (passfile, "%s/%s", path, CVS_PASSWORD_FILE);
+    }
+    else {
     passfile =
-	(char *) xmalloc (strlen (homedir) + strlen (CVS_PASSWORD_FILE) + 3);
+        (char *) xmalloc (strlen (homedir) + strlen (CVS_PASSWORD_FILE) + 4);
     strcpy (passfile, homedir);
 #ifndef NO_SLASH_AFTER_HOME
     /* NO_SLASH_AFTER_HOME is defined for VMS, where foo:[bar]/.cvspass is not
@@ -75,7 +87,11 @@
        kind of thing....  */
     strcat (passfile, "/");
 #endif
+    strcat (passfile, ".");
     strcat (passfile, CVS_PASSWORD_FILE);
+    } /* else */
+    if (path)
+	    free(path);
 
     /* Safety first and last, Scouts. */
     if (isfile (passfile))
--- cvs-1.11.1p1.org/src/cvsrc.c	Sun Dec 22 14:18:41 2002
+++ cvs-1.11.1p1/src/cvsrc.c	Sun Dec 22 14:30:43 2002
@@ -9,13 +9,14 @@
  */
 
 
+#include <sys/stat.h>
 #include "cvs.h"
 #include "getline.h"
 
 /* this file is to be found in the user's home directory */
 
 #ifndef	CVSRC_FILENAME
-#define	CVSRC_FILENAME	".cvsrc"
+#define	CVSRC_FILENAME	"cvsrc"
 #endif
 char cvsrc[] = CVSRC_FILENAME;
 
@@ -36,6 +37,9 @@
     char *homeinit;
     FILE *cvsrcfile;
 
+    char *path;
+    struct stat st;
+    
     char *line;
     int line_length;
     size_t line_chars_allocated;
@@ -73,10 +77,22 @@
     if (!homedir)
 	return;
 
+    if ( (path=getenv("CONFIG_DIR")) && path[0] ) {
+	path=(char*) malloc(strlen(homedir)+strlen(getenv("CONFIG_DIR"))+2);
+	sprintf(path, "%s/%s", homedir, getenv("CONFIG_DIR"));
+    } else path=(char *) NULL;
+    if ( path && stat(path,&st)!=-1 && S_ISDIR(st.st_mode) ) {
+	homeinit = (char *) xmalloc (strlen (path) + strlen (cvsrc) + 3);
+	sprintf (homeinit, "%s/%s", path, cvsrc);
+    }
+    else {
     homeinit = (char *) xmalloc (strlen (homedir) + strlen (cvsrc) + 10);
     strcpy (homeinit, homedir);
     strcat (homeinit, "/");
     strcat (homeinit, cvsrc);
+    } /* else */
+    if (path)
+	free(path);
 
     /* if it can't be read, there's no point to continuing */