Changes to gnats/gnats/gnats-pwconv.c

Milan Zamazal <[email protected]> Sun, 28 Jul 2002 15:21:21 -0400
Newsgroups gmane.comp.bug-tracking.gnats.patches
Message-ID <[email protected]>
Index: gnats/gnats/gnats-pwconv.c
diff -c gnats/gnats/gnats-pwconv.c:1.3 gnats/gnats/gnats-pwconv.c:1.4
*** gnats/gnats/gnats-pwconv.c:1.3	Sun Jul 14 13:29:48 2002
--- gnats/gnats/gnats-pwconv.c	Sun Jul 28 15:21:21 2002
***************
*** 47,55 ****
  #else
      " -p INFILE [OUTFILE]\n",
  #endif
! "Convert GNATS v3 gnatsd.access passwords to version 4 format.\n\
! Supports plaintext, DES crypt and MD5 output.\n\
! \n",
  #ifdef HAVE_LIBCRYPT    
  "  -c  --crypt        Use crypt() encryption of passwords.\n\
    -m  --md5          Use MD5 encryption.\n",
--- 47,59 ----
  #else
      " -p INFILE [OUTFILE]\n",
  #endif
!     "Convert GNATS v3 gnatsd*.access passwords to version 4 format.\n",
! #ifdef HAVE_LIBCRYPT
!     "Supports plaintext, DES crypt and MD5 output.\n",
! #else
!     "Supports only unencrypted plaintext (compiled without `libcrypt').\n",
! #endif
!     "\n",
  #ifdef HAVE_LIBCRYPT    
  "  -c  --crypt        Use crypt() encryption of passwords.\n\
    -m  --md5          Use MD5 encryption.\n",
***************
*** 244,250 ****
--- 248,258 ----
  int
  main (int argc, char **argv)
  {
+ #ifdef HAVE_LIBCRYPT
    static const char* const OPTSTRING = "pcmVh";
+ #else
+   static const char* const OPTSTRING = "pVh";
+ #endif
    int optc = 0;
    int opt_index = 0;
    Crypt_Type crypttype = NONE;