shishi/lib internal.h realm.c

[shishi-commit]

CVSROOT:        /cvsroot/shishi
Module name:    shishi
Branch:         
Changes by:     Simon Josefsson <address@hidden>        03/09/23 20:45:05

Modified files:
        lib            : internal.h realm.c 

Log message:
        Use xgetdomainname.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/lib/internal.h.diff?tr1=1.70&tr2=1.71&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/lib/realm.c.diff?tr1=1.13&tr2=1.14&r1=text&r2=text

Patches:
Index: shishi/lib/internal.h
diff -u shishi/lib/internal.h:1.70 shishi/lib/internal.h:1.71
--- shishi/lib/internal.h:1.70  Tue Sep 23 19:35:03 2003
+++ shishi/lib/internal.h       Tue Sep 23 20:45:05 2003
@@ -125,6 +125,7 @@
 #include "xalloc.h"
 #include "xmemdup.h"
 #include "xgethostname.h"
+#include "xgetdomainname.h"
 #include "xstrndup.h"
 
 #include "shishi.h"
@@ -156,10 +157,6 @@
                  SHISHI_VERBOSE_NOICE |        \
                  SHISHI_VERBOSE_CRYPTO_NOICE)
 #define VERBOSE(h) (h->verbose & ~VERBOSES)
-
-#ifndef HOST_NAME_MAX
-#define HOST_NAME_MAX BUFSIZ
-#endif
 
 enum
 {
Index: shishi/lib/realm.c
diff -u shishi/lib/realm.c:1.13 shishi/lib/realm.c:1.14
--- shishi/lib/realm.c:1.13     Tue Sep 23 19:35:03 2003
+++ shishi/lib/realm.c  Tue Sep 23 20:45:05 2003
@@ -37,22 +37,23 @@
 char *
 shishi_realm_default_guess (void)
 {
-  char buf[HOST_NAME_MAX];
   char *realm;
-  int ret;
 
-  /* XXX use a xgetdomainname() */
-  ret = getdomainname (buf, sizeof (buf));
-  buf[sizeof (buf) - 1] = '\0';
-  if (ret == 0 && strlen (buf) > 0 && strcmp (buf, "(none)") != 0)
-    return strdup(buf);
+  realm = xgetdomainname ();
+  if (realm && strlen (realm) > 0 && strcmp (realm, "(none)") != 0)
+    return realm;
+
+  if (realm)
+    free (realm);
 
   realm = xgethostname ();
-  if (strlen (realm) == 0 || strcmp (realm, "(none)") == 0)
-    {
-      free (realm);
-      realm = strdup ("could-not-guess-default-realm");
-    }
+  if (realm && strlen (realm) > 0 || strcmp (realm, "(none)") != 0)
+    return realm;
+
+  if (realm)
+    free (realm);
+
+  realm = strdup ("could-not-guess-default-realm");
 
   return realm;
 }