summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-06-21 04:24:49 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:18:36 -0500
commit9cc64156c48837944a41e8e9eb2f3283a3859072 (patch)
tree300a9485c84cc0cf727dd83f9596386882c09be7 /source4
parent51b1451cbaf7b27af1d5f1a5f5a42430afe99234 (diff)
downloadsamba-9cc64156c48837944a41e8e9eb2f3283a3859072.tar.gz
samba-9cc64156c48837944a41e8e9eb2f3283a3859072.tar.bz2
samba-9cc64156c48837944a41e8e9eb2f3283a3859072.zip
r7793: allow integers in smb.conf to be specified in octal or hex
(This used to be commit ce6257b316bc66a3fc554487099976a853d25ddd)
Diffstat (limited to 'source4')
-rw-r--r--source4/param/loadparm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 49bb52230e..d59d4efadf 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -1398,7 +1398,7 @@ static int lp_int(const char *s)
return (-1);
}
- return atoi(s);
+ return strtol(s, NULL, 0);
}
/*******************************************************************
@@ -1412,7 +1412,7 @@ static int lp_ulong(const char *s)
return (-1);
}
- return strtoul(s, NULL, 10);
+ return strtoul(s, NULL, 0);
}
/*******************************************************************