X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=ident.c;h=bc89e1d04c63563c051005754a50247f22256974;hb=3dd94e3b2e2f5b00512273f96ab5628c742c112c;hp=7a9f5672ebfa0d3fc4ba72b7b90273b11aeebee4;hpb=e1b10391eabdaaa4c89c53099dd96d5f9d978719;p=git.git

diff --git a/ident.c b/ident.c
index 7a9f5672..bc89e1d0 100644
--- a/ident.c
+++ b/ident.c
@@ -8,8 +8,7 @@
 #include "cache.h"
 
 #include <pwd.h>
-#include <time.h>
-#include <ctype.h>
+#include <netdb.h>
 
 static char git_default_date[50];
 
@@ -66,9 +65,16 @@ int setup_ident(void)
 	git_default_email[len++] = '@';
 	gethostname(git_default_email + len, sizeof(git_default_email) - len);
 	if (!strchr(git_default_email+len, '.')) {
+		struct hostent *he = gethostbyname(git_default_email + len);
+		char *domainname;
+
 		len = strlen(git_default_email);
 		git_default_email[len++] = '.';
-		getdomainname(git_default_email+len, sizeof(git_default_email)-len);
+		if (he && (domainname = strchr(he->h_name, '.')))
+			strncpy(git_default_email + len, domainname + 1, sizeof(git_default_email) - len);
+		else
+			strncpy(git_default_email + len, "(none)", sizeof(git_default_email) - len);
+		git_default_email[sizeof(git_default_email) - 1] = 0;
 	}
 	/* And set the default date */
 	datestamp(git_default_date, sizeof(git_default_date));