webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source
This commit is contained in:
Arne Fitzenreiter
2016-10-22 10:33:46 +02:00
parent 868d2a1fff 86667d0c7a
commit 5a2ebd32c0
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/core/106/filelists/files
View File

@@ -22,5 +22,4 @@ srv/web/ipfire/cgi-bin/logs.cgi/log.dat
srv/web/ipfire/cgi-bin/pakfire.cgi srv/web/ipfire/cgi-bin/pakfire.cgi
srv/web/ipfire/cgi-bin/pppsetup.cgi srv/web/ipfire/cgi-bin/pppsetup.cgi
srv/web/ipfire/cgi-bin/services.cgi srv/web/ipfire/cgi-bin/services.cgi
usr/sbin/setup
var/ipfire/backup/include var/ipfire/backup/include

2
make.sh
View File

@@ -26,7 +26,7 @@ NAME="IPFire" # Software name
SNAME="ipfire" # Short name SNAME="ipfire" # Short name
VERSION="2.19" # Version number VERSION="2.19" # Version number
CORE="106" # Core Level (Filename) CORE="106" # Core Level (Filename)
PAKFIRE_CORE="105" # Core Level (PAKFIRE) PAKFIRE_CORE="106" # Core Level (PAKFIRE)
GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir CONFIG_ROOT=/var/ipfire # Configuration rootdir

2
src/setup/passwords.c
View File

@@ -56,7 +56,7 @@ int handleadminpassword(void)
return 0; return 0;
snprintf(commandstring, STRING_SIZE, snprintf(commandstring, STRING_SIZE,
"/usr/sbin/htpasswd -c -s -b " CONFIG_ROOT "/auth/users admin '%s'", password); "/usr/sbin/htpasswd -c -m -b " CONFIG_ROOT "/auth/users admin '%s'", password);
sprintf(message, _("Setting %s 'admin' user password..."), NAME); sprintf(message, _("Setting %s 'admin' user password..."), NAME);
if (runhiddencommandwithstatus(commandstring, _("Setting password"), message, NULL)) { if (runhiddencommandwithstatus(commandstring, _("Setting password"), message, NULL)) {
sprintf(message, _("Problem setting %s 'admin' user password."), NAME); sprintf(message, _("Problem setting %s 'admin' user password."), NAME);