Some passwd fixes

This commit is contained in:
Michiel Broek 2001-12-20 21:52:13 +00:00
parent cb0ff54acf
commit ee0f4db63d
12 changed files with 53 additions and 50 deletions

View File

@ -4235,6 +4235,8 @@ v0.33.19 26-Oct-2001
can't start the bbs from telnet anymore! With a later release can't start the bbs from telnet anymore! With a later release
this may change by adding a login wrapper, for now this is how this may change by adding a login wrapper, for now this is how
it works now. Take it or leave it. it works now. Take it or leave it.
On FreeBSD the installed files are not removed anymore from
the source tree.
Added German language file made by Harald Wuensch. Added German language file made by Harald Wuensch.
SETUP.sh SETUP.sh

View File

@ -106,14 +106,14 @@ install:
@${CHOWN} ${OWNER}.${GROUP} ${PREFIX}/html/misc @${CHOWN} ${OWNER}.${GROUP} ${PREFIX}/html/misc
@${CHOWN} ${OWNER}.${GROUP} ${PREFIX}/html/programs @${CHOWN} ${OWNER}.${GROUP} ${PREFIX}/html/programs
@${CHOWN} ${OWNER}.${GROUP} ${PREFIX}/html/setup @${CHOWN} ${OWNER}.${GROUP} ${PREFIX}/html/setup
@${INSTALL} -o ${OWNER} -g ${GROUP} -m 0444 ${H_BASE} ${PREFIX}/html @${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_BASE} ${PREFIX}/html
@${INSTALL} -o ${OWNER} -g ${GROUP} -m 0444 ${H_FTSC} ${PREFIX}/html/ftsc @${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_FTSC} ${PREFIX}/html/ftsc
@${INSTALL} -o ${OWNER} -g ${GROUP} -m 0444 ${H_IMAGES} ${PREFIX}/html/images @${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_IMAGES} ${PREFIX}/html/images
@${INSTALL} -o ${OWNER} -g ${GROUP} -m 0444 ${H_LICENSE} ${PREFIX}/html/license @${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_LICENSE} ${PREFIX}/html/license
@${INSTALL} -o ${OWNER} -g ${GROUP} -m 0444 ${H_MENUS} ${PREFIX}/html/menus @${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_MENUS} ${PREFIX}/html/menus
@${INSTALL} -o ${OWNER} -g ${GROUP} -m 0444 ${H_MISC} ${PREFIX}/html/misc @${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_MISC} ${PREFIX}/html/misc
@${INSTALL} -o ${OWNER} -g ${GROUP} -m 0444 ${H_PROGS} ${PREFIX}/html/programs @${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_PROGS} ${PREFIX}/html/programs
@${INSTALL} -o ${OWNER} -g ${GROUP} -m 0444 ${H_SETUP} ${PREFIX}/html/setup @${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0444 ${H_SETUP} ${PREFIX}/html/setup
clean: clean:
rm -f filelist rm -f filelist

View File

@ -14,7 +14,7 @@ clean:
rm -f core filelist Makefile.bak *.lang rm -f core filelist Makefile.bak *.lang
install: ${LDAT} install: ${LDAT}
${INSTALL} -o ${OWNER} -g ${GROUP} -m 0444 ${LDAT} ${ETCDIR} ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0444 ${LDAT} ${ETCDIR}
english.lang: english.txt english.lang: english.txt
../mbsebbs/mblang english.lang english.txt ../mbsebbs/mblang english.lang english.txt

View File

@ -46,8 +46,8 @@ clean:
rm -f ${TARGET} *.o *.h~ *.c~ core filelist Makefile.bak rm -f ${TARGET} *.o *.h~ *.c~ core filelist Makefile.bak
install: all install: all
${INSTALL} -s -g ${GROUP} -o ${OWNER} -m 4751 mbcico ${BINDIR} ${INSTALL} -c -s -g ${GROUP} -o ${OWNER} -m 4751 mbcico ${BINDIR}
${INSTALL} -s -g ${GROUP} -o ${OWNER} -m 0755 mbout ${BINDIR} ${INSTALL} -c -s -g ${GROUP} -o ${OWNER} -m 0755 mbout ${BINDIR}
mbcico: ${MBCICO_OBJS} ${LIBS} mbcico: ${MBCICO_OBJS} ${LIBS}
${CC} -o mbcico ${MBCICO_OBJS} ${LIBS} ${CC} -o mbcico ${MBCICO_OBJS} ${LIBS}

View File

@ -88,13 +88,13 @@ clean:
rm -f ${TARGET} *.o *.h~ *.c~ core filelist Makefile.bak rm -f ${TARGET} *.o *.h~ *.c~ core filelist Makefile.bak
install: all install: all
${INSTALL} -s -o ${OWNER} -g ${GROUP} -m 4751 mbfido ${BINDIR} ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 4751 mbfido ${BINDIR}
${INSTALL} -s -o ${OWNER} -g ${GROUP} -m 0711 mbseq ${BINDIR} ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0711 mbseq ${BINDIR}
${INSTALL} -s -o ${OWNER} -g ${GROUP} -m 0711 mbaff ${BINDIR} ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0711 mbaff ${BINDIR}
${INSTALL} -s -o ${OWNER} -g ${GROUP} -m 0711 mbindex ${BINDIR} ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0711 mbindex ${BINDIR}
${INSTALL} -s -o ${OWNER} -g ${GROUP} -m 0711 mbdiff ${BINDIR} ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0711 mbdiff ${BINDIR}
${INSTALL} -s -o ${OWNER} -g ${GROUP} -m 0711 mbfile ${BINDIR} ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0711 mbfile ${BINDIR}
${INSTALL} -s -o ${OWNER} -g ${GROUP} -m 0711 mbmsg ${BINDIR} ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0711 mbmsg ${BINDIR}
rm -f ${BINDIR}/mbmail rm -f ${BINDIR}/mbmail
ln -s ${BINDIR}/mbfido ${BINDIR}/mbmail ln -s ${BINDIR}/mbfido ${BINDIR}/mbmail
rm -f ${BINDIR}/mbnews rm -f ${BINDIR}/mbnews

View File

@ -26,7 +26,7 @@ clean:
rm -f mbmon *.o *.h~ *.c~ core filelist Makefile.bak rm -f mbmon *.o *.h~ *.c~ core filelist Makefile.bak
install: all install: all
${INSTALL} -s -g ${GROUP} -o ${OWNER} -m ${MODE} mbmon ${BINDIR} ${INSTALL} -c -s -g ${GROUP} -o ${OWNER} -m ${MODE} mbmon ${BINDIR}
filelist: Makefile filelist: Makefile
BASE=`pwd`; \ BASE=`pwd`; \

View File

@ -106,16 +106,16 @@ install: all
@if [ "`id -un`" != "root" ] ; then \ @if [ "`id -un`" != "root" ] ; then \
echo; echo " Must be root to install!"; echo; exit 3; \ echo; echo " Must be root to install!"; echo; exit 3; \
fi fi
${INSTALL} -s -o ${OWNER} -g ${GROUP} -m 0751 mbsebbs ${BINDIR} ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0751 mbsebbs ${BINDIR}
${INSTALL} -s -o ${OWNER} -g ${GROUP} -m 6711 mbnewusr ${BINDIR} ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 6711 mbnewusr ${BINDIR}
${INSTALL} -s -o ${OWNER} -g ${GROUP} -m 0711 mball ${BINDIR} ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0711 mball ${BINDIR}
${INSTALL} -s -o ${OWNER} -g ${GROUP} -m 0711 mblang ${BINDIR} ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0711 mblang ${BINDIR}
${INSTALL} -s -o ${OWNER} -g ${GROUP} -m 0711 mbchat ${BINDIR} ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0711 mbchat ${BINDIR}
${INSTALL} -s -o ${OWNER} -g ${GROUP} -m 0711 mbstat ${BINDIR} ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0711 mbstat ${BINDIR}
${INSTALL} -s -o ${OWNER} -g ${GROUP} -m 0711 mbtoberep ${BINDIR} ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0711 mbtoberep ${BINDIR}
${INSTALL} -s -o `id -un` -g `id -gn` -m 6711 mbuser ${BINDIR} ${INSTALL} -c -s -o `id -un` -g `id -gn` -m 6711 mbuser ${BINDIR}
${INSTALL} -s -o `id -un` -g `id -gn` -m 6711 mbuseradd ${BINDIR} ${INSTALL} -c -s -o `id -un` -g `id -gn` -m 6711 mbuseradd ${BINDIR}
${INSTALL} -s -o `id -un` -g `id -gn` -m 6711 mbpasswd ${BINDIR} ${INSTALL} -c -s -o `id -un` -g `id -gn` -m 6711 mbpasswd ${BINDIR}
@rm -f ${BINDIR}/mbfbgen @rm -f ${BINDIR}/mbfbgen
filelist: Makefile filelist: Makefile

View File

@ -1,8 +1,7 @@
/***************************************************************************** /*****************************************************************************
* *
* File ..................: mbpasswd.c * $Id$
* Purpose ...............: setuid root version of passwd * Purpose ...............: setuid root version of passwd
* Last modification date : 10-Aug-2001
* Shadow Suite (c) ......: Julianne Frances Haugh * Shadow Suite (c) ......: Julianne Frances Haugh
* *
***************************************************************************** *****************************************************************************
@ -871,7 +870,7 @@ int main(int argc, char *argv[])
strcpy(temp, "/sbin/chpass"); strcpy(temp, "/sbin/chpass");
else { else {
fprintf(stderr, "mbpasswd: Can't find chpass\n"); fprintf(stderr, "mbpasswd: Can't find chpass\n");
syslog(LOG_INFO, "Can't find chpass"); syslog(LOG_ERR, "Can't find chpass");
closelog(); closelog();
exit(E_FAILURE); exit(E_FAILURE);
} }
@ -879,14 +878,14 @@ int main(int argc, char *argv[])
if (system(cmd) != 0) { if (system(cmd) != 0) {
perror("mbpasswd: failed to change password\n"); perror("mbpasswd: failed to change password\n");
syslog(LOG_INFO, "password change for `%s' failed", name); syslog(LOG_ERR, "password change for `%s' failed", name);
closelog(); closelog();
exit(E_FAILURE); exit(E_FAILURE);
} }
#endif /* __FreeBSD__ */ #endif /* __FreeBSD__ */
syslog(LOG_INFO, "password for `%s' changed by user `%s'", name, myname); syslog(LOG_NOTICE, "password for `%s' changed by user `%s'", name, myname);
closelog(); closelog();
exit(E_SUCCESS); exit(E_SUCCESS);
} }

View File

@ -1,8 +1,7 @@
/***************************************************************************** /*****************************************************************************
* *
* File ..................: mbuseradd/salt.c * $Id$
* Purpose ...............: MBSE BBS Shadow Password Suite * Purpose ...............: MBSE BBS Shadow Password Suite
* Last modification date : 13-May-2001
* Original Source .......: Shadow Password Suite * Original Source .......: Shadow Password Suite
* Original Copyrioght ...: Julianne Frances Haugh and others. * Original Copyrioght ...: Julianne Frances Haugh and others.
* *
@ -64,9 +63,12 @@ char *crypt_make_salt(void)
static char result[40]; static char result[40];
result[0] = '\0'; result[0] = '\0';
#ifndef __FreeBSD__
if (getdef_bool("MD5_CRYPT_ENAB")) { if (getdef_bool("MD5_CRYPT_ENAB")) {
strcpy(result, "$1$"); /* magic for the new MD5 crypt() */ strcpy(result, "$1$"); /* magic for the new MD5 crypt() */
} }
#endif
/* /*
* Generate 8 chars of salt, the old crypt() will use only first 2. * Generate 8 chars of salt, the old crypt() will use only first 2.

View File

@ -39,7 +39,7 @@ clean:
rm -f mbsetup *.o *.h~ *.c~ core filelist Makefile.bak rm -f mbsetup *.o *.h~ *.c~ core filelist Makefile.bak
install: all install: all
${INSTALL} -s -g ${GROUP} -o ${OWNER} -m ${MODE} mbsetup ${BINDIR} ${INSTALL} -c -s -g ${GROUP} -o ${OWNER} -m ${MODE} mbsetup ${BINDIR}
filelist: Makefile filelist: Makefile
BASE=`pwd`; \ BASE=`pwd`; \

View File

@ -30,7 +30,7 @@ install: all
@if [ "`id -un`" != "root" ] ; then \ @if [ "`id -un`" != "root" ] ; then \
echo; echo " Must be root to install!"; echo; exit 3; \ echo; echo " Must be root to install!"; echo; exit 3; \
fi fi
${INSTALL} -s -o `id -un` -g `id -gn` -m 6711 mbtask ${BINDIR} ${INSTALL} -c -s -o `id -un` -g `id -gn` -m 6711 mbtask ${BINDIR}
@if [ -f ${ETCDIR}/mbsed.conf ]; then \ @if [ -f ${ETCDIR}/mbsed.conf ]; then \
rm ${ETCDIR}/mbsed.conf ; \ rm ${ETCDIR}/mbsed.conf ; \
fi fi
@ -41,8 +41,8 @@ install: all
rm ${BINDIR}/mbsed ; \ rm ${BINDIR}/mbsed ; \
fi fi
@if [ ! -f ${ETCDIR}/issue ]; then \ @if [ ! -f ${ETCDIR}/issue ]; then \
${INSTALL} -o ${OWNER} -g ${GROUP} -m 0644 issue ${ETCDIR} ; \ ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 issue ${ETCDIR} ; \
echo "${INSTALL} -o ${OWNER} -g ${GROUP} -m 0644 issue ${ETCDIR}"; \ echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0644 issue ${ETCDIR}"; \
fi fi
filelist: Makefile filelist: Makefile

View File

@ -19,23 +19,23 @@ install:
echo; echo " Must be root to install!"; echo; exit 3; \ echo; echo " Must be root to install!"; echo; exit 3; \
fi fi
@if [ ! -x ${ETCDIR}/maint ]; then \ @if [ ! -x ${ETCDIR}/maint ]; then \
${INSTALL} -o ${OWNER} -g ${GROUP} -m 0711 maint ${ETCDIR} ; \ ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0711 maint ${ETCDIR} ; \
echo "${INSTALL} -o ${OWNER} -g ${GROUP} -m 0711 maint ${ETCDIR}" ; \ echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0711 maint ${ETCDIR}" ; \
fi fi
@if [ ! -x ${ETCDIR}/midnight ]; then \ @if [ ! -x ${ETCDIR}/midnight ]; then \
${INSTALL} -o ${OWNER} -g ${GROUP} -m 0711 midnight ${ETCDIR} ; \ ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0711 midnight ${ETCDIR} ; \
echo "${INSTALL} -o ${OWNER} -g ${GROUP} -m 0711 midnight ${ETCDIR}" ; \ echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0711 midnight ${ETCDIR}" ; \
fi fi
@if [ ! -x ${ETCDIR}/weekly ]; then \ @if [ ! -x ${ETCDIR}/weekly ]; then \
${INSTALL} -o ${OWNER} -g ${GROUP} -m 0711 weekly ${ETCDIR} ; \ ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0711 weekly ${ETCDIR} ; \
echo "${INSTALL} -o ${OWNER} -g ${GROUP} -m 0711 weekly ${ETCDIR}" ; \ echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0711 weekly ${ETCDIR}" ; \
fi fi
@if [ ! -x ${ETCDIR}/monthly ]; then \ @if [ ! -x ${ETCDIR}/monthly ]; then \
${INSTALL} -o ${OWNER} -g ${GROUP} -m 0711 monthly ${ETCDIR} ; \ ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0711 monthly ${ETCDIR} ; \
echo "${INSTALL} -o ${OWNER} -g ${GROUP} -m 0711 monthly ${ETCDIR}" ; \ echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0711 monthly ${ETCDIR}" ; \
fi fi
${INSTALL} -o ${OWNER} -g ${GROUP} -m 0755 bbsdoor.sh ${BINDIR} ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0755 bbsdoor.sh ${BINDIR}
${INSTALL} -o ${OWNER} -g ${GROUP} -m 0755 rundoor.sh ${BINDIR} ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0755 rundoor.sh ${BINDIR}
@bash ./installinit.sh @bash ./installinit.sh
filelist: Makefile filelist: Makefile