Changes to gnats/gnats/client.c

Index: gnats/gnats/client.c
diff -c gnats/gnats/client.c:1.42 gnats/gnats/client.c:1.43
*** gnats/gnats/client.c:1.42	Sun Dec  2 13:37:47 2001
--- gnats/gnats/client.c	Sun Jul 14 13:30:07 2002
***************
*** 1,6 ****
  /* Common functions for each GNATS client.
     Copyright (C) 2001 Dan Martinez
-    Copyright (C) 1994, 1995, 1999, 2000 Free Software Foundation, Inc.
     Contributed by Brendan Kehoe ([email protected]).
  
  This file is part of GNU GNATS.
--- 1,6 ----
  /* Common functions for each GNATS client.
+    Copyright (C) 1994, 1995, 1999, 2000, 2002 Free Software Foundation, Inc.
     Copyright (C) 2001 Dan Martinez
     Contributed by Brendan Kehoe ([email protected]).
  
  This file is part of GNU GNATS.
***************
*** 779,786 ****
  {
    char *vals[5];
    char *evar = getenv ("GNATSDB");
  
!   if (evar == NULL || evar[0] == '\0' || databaseSpecIsNetConn (evar))
      {
        if (*hostname == NULL)
  	{
--- 779,787 ----
  {
    char *vals[5];
    char *evar = getenv ("GNATSDB");
+   bool is_net_conn = databaseSpecIsNetConn (evar);
  
!   if (evar == NULL || evar[0] == '\0' || is_net_conn)
      {
        if (*hostname == NULL)
  	{
***************
*** 908,916 ****
        *passwd = xstrdup ("*");
      }
  
!   if (*database == NULL)
      {
!       *database = xstrdup ("default");
      }
  
    if (*port == -1)
--- 909,919 ----
        *passwd = xstrdup ("*");
      }
  
!   if (*database == NULL && ! is_net_conn)
      {
!       *database = ((evar == NULL || evar[0] == '\0')
! 		   ? xstrdup ("default")
! 		   : xstrdup (evar));
      }
  
    if (*port == -1)