Merge pull request #37 from t-brown/netrc_bugfix

Fixing netrc usage.

Author: t-brown

.gitignore

@@ -5,13 +5,16 @@ build-aux/*
 config.log
 config.status
 configure
+configure~
 po/POTFILES
 po/remove-potcdate.sed
+po/Makevars.template
 Makefile
 Makefile.in
 src/.deps/
 src/config.h
 src/config.h.in
+src/config.h.in~
 src/stamp-h1
 src/*.o
 VERSION

src/rc.c

@@ -186,7 +186,7 @@ read_rc(const char *file)
 		abs_file = NULL;
 	}
 
-	if (options.username == NULL) {
+	if (options.username == NULL && options.netrc == 0) {
 		options.username = strdup(getenv("USER"));
 	}