Fix bug in ocrc.c#combinecredentials

where a null user+pwd generates
garbage. This in turn interferes
with using .netrc because the garbage
user+pwd can (sometimes) override
the .netrc.
Not entirely sure what is going on
because it works as is under e.g. cygwin.
In any case it needs fixing.

Author: DennisHeimbigner

libdap4/d4rc.c

@@ -519,7 +519,7 @@ storedump(char* msg, NClist* triples)
     for(i=0;i<nclistlength(triples);i++) {
 	NCD4triple* t = (NCD4triple*)nclistget(triples,i);
         fprintf(stderr,"\t%s\t%s\t%s\n",
-                (strlen(t->host)==0?"--":t->host),t->key,t->value);
+                ((t->host==NULL || strlen(t->host)==0)?"--":t->host),t->key,t->value);
     }
     fflush(stderr);
 }

oc2/ocrc.c

@@ -91,9 +91,8 @@ combinecredentials(const char* user, const char* pwd)
     int userPassSize;
     char *userPassword;
 
-    if(user == NULL) user = "";
-    if(pwd == NULL) pwd = "";
-
+    if(user == NULL || pwd == NULL)
+	return NULL;	
     userPassSize = strlen(user) + strlen(pwd) + 2;
     userPassword = malloc(sizeof(char) * userPassSize);
     if (!userPassword) {