Changes to gnats/debian/scripts/adduser

[Milan Zamazal]

Index: gnats/debian/scripts/adduser
diff -c gnats/debian/scripts/adduser:1.1 gnats/debian/scripts/adduser:1.2
*** gnats/debian/scripts/adduser:1.1    Sun May 27 11:59:38 2001
--- gnats/debian/scripts/adduser        Sun Dec 23 15:20:15 2001
***************
*** 9,16 ****
  
  if [ "$1" = configure ]; then
  
!   PWFOUND=$(protect grep -c '^gnats:' $PASSWDFILE)
!   PWGSTAR=$(protect grep -c '^gnats:\*:' $PASSWDFILE)
  
    if [ $PWFOUND -gt 1 ]; then
      db_subst gnats/user_multiple PASSWDFILE "$PASSWDFILE"
--- 9,15 ----
  
  if [ "$1" = configure ]; then
  
!   PWFOUND=$(protect grep -c "^$GNATSUSER:" $PASSWDFILE)
  
    if [ $PWFOUND -gt 1 ]; then
      db_subst gnats/user_multiple PASSWDFILE "$PASSWDFILE"
***************
*** 19,48 ****
    fi
  
    if [ $PWFOUND -gt 0 ]; then
!     if [ $(protect grep -c "^gnats:.*:$GNATSHOME:" $PASSWDFILE) -eq 0 ]; then
!       db_subst gnats/user_badhome PASSWDFILE "$PASSWDFILE"
!       db_subst gnats/user_badhome GNATSENTRY "$GNATSENTRY"
!       db_input high gnats/user_badhome || true
!       db_go
      fi
!     if [ $(protect grep -c "^gnats:[^:]*:$GNATSID:$GNATSGID:" $PASSWDFILE) \
         -eq 0 ]
      then
!       db_subst gnats/user_baduid PASSWDFILE "$PASSWDFILE"
!       db_subst gnats/user_baduid GNATSENTRY "$GNATSENTRY"
!       db_input high gnats/user_baduid || true
!       db_go
      fi
    else
!     db_subst gnats/user_notfound PASSWDFILE "$PASSWDFILE"
!     db_subst gnats/user_notfound GNATSENTRY "${GNATSENTRY/:x:/:*:}"
!     db_input high gnats/user_notfound || true
!     db_go
!   fi
! 
!   if [ $PWFOUND -eq 0 ] || [ $PWGSTAR -ne 0 ]; then
!     db_input medium gnats/user_nopassword || true
!     db_go
    fi
  
  fi
--- 18,39 ----
    fi
  
    if [ $PWFOUND -gt 0 ]; then
!     if [ $(protect grep -c "^$GNATSUSER:.*:$GNATSOLDHOME:" $PASSWDFILE) -gt 0 
]
!     then
!       if [ -e $GNATSOLDHOME/.profile ]; then
!       mv $GNATSOLDHOME/.profile $GNATSHOME/
!       fi
!       usermod -d $GNATSHOME $GNATSUSER
      fi
!     if [ $(protect grep -c "^$GNATSUSER:[^:]*:$GNATSID:$GNATSGID:" 
$PASSWDFILE) \
         -eq 0 ]
      then
!       usermod -u $GNATSID -G $GNATSGID $GNATSUSER
      fi
    else
!     adduser --quiet --system --home $GNATSHOME --no-create-home \
!             --gid $GNATSGID --shell /bin/sh --disabled-login \
!           --gecos 'GNU GNATS Bug-Reporting System' $GNATSUSER
    fi
  
  fi