[PATCH] getdomainname should be usable on SunOS with -lnsl

[git.git] / ident.c

diff --git a/ident.c b/ident.c
index 7e917f7..a2d241f 100644 (file)
--- a/ident.c
+++ b/ident.c
@@ -36,13 +36,11 @@ int setup_ident(void)
        memcpy(real_email, pw->pw_name, len);
        real_email[len++] = '@';
        gethostname(real_email + len, sizeof(real_email) - len);
-#ifndef NO_GETDOMAINNAME
        if (!strchr(real_email+len, '.')) {
                len = strlen(real_email);
                real_email[len++] = '.';
                getdomainname(real_email+len, sizeof(real_email)-len);
        }
-#endif
        /* And set the default date */
        datestamp(real_date, sizeof(real_date));
        return 0;
@@ -150,10 +148,10 @@ char *get_ident(const char *name, const char *email, const char *date_str)
 
 char *git_author_info(void)
 {
-       return get_ident(gitenv("GIT_AUTHOR_NAME"), gitenv("GIT_AUTHOR_EMAIL"), gitenv("GIT_AUTHOR_DATE"));
+       return get_ident(getenv("GIT_AUTHOR_NAME"), getenv("GIT_AUTHOR_EMAIL"), getenv("GIT_AUTHOR_DATE"));
 }
 
 char *git_committer_info(void)
 {
-       return get_ident(gitenv("GIT_COMMITTER_NAME"), gitenv("GIT_COMMITTER_EMAIL"), gitenv("GIT_COMMITTER_DATE"));
+       return get_ident(getenv("GIT_COMMITTER_NAME"), getenv("GIT_COMMITTER_EMAIL"), getenv("GIT_COMMITTER_DATE"));
 }