diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/Makefile.in | 17 | ||||
| -rw-r--r-- | source3/configure.in | 24 | ||||
| -rw-r--r-- | source3/nsswitch/winbindd_group.c | 4 |
3 files changed, 34 insertions, 11 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index a660718c37..63dfeeec5f 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -9,7 +9,6 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -mandir=@mandir@ LIBS=@LIBS@ CC=@CC@ @@ -1310,12 +1309,16 @@ installman: installdirs showlayout: @echo "Samba will be installed into:" - @echo " basedir: $(BASEDIR)" - @echo " bindir: $(BINDIR)" - @echo " sbindir: $(SBINDIR)" - @echo " libdir: $(LIBDIR)" - @echo " vardir: $(VARDIR)" - @echo " mandir: $(MANDIR)" + @echo " basedir: $(BASEDIR)" + @echo " bindir: $(BINDIR)" + @echo " sbindir: $(SBINDIR)" + @echo " libdir: $(LIBDIR)" + @echo " vardir: $(VARDIR)" + @echo " mandir: $(MANDIR)" + @echo " privatedir: $(PRIVATE_DIR)" + @echo " configdir: $(CONFIGDIR)" + @echo " lockdir: $(LOCKDIR)" + @echo " piddir: $(PIDDIR)" uninstall: uninstallman uninstallbin uninstallscripts uninstallmodules diff --git a/source3/configure.in b/source3/configure.in index 5c4580f14a..b5b5a7609f 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -17,8 +17,9 @@ AC_PREFIX_DEFAULT(/usr/local/samba) AC_ARG_WITH(fhs, [ --with-fhs Use FHS-compliant paths (default=no)], configdir="${sysconfdir}/samba" - lockdir="\${VARDIR}/cache/samba" - piddir="\${VARDIR}/run/samba" + lockdir="\${VARDIR}/lib/samba" + piddir="\${VARDIR}/run" + mandir="\${prefix}/share/man" logfilebase="\${VARDIR}/log/samba" privatedir="\${CONFIGDIR}/private" libdir="\${prefix}/lib/samba" @@ -27,6 +28,7 @@ AC_ARG_WITH(fhs, logfilebase="\${VARDIR}" lockdir="\${VARDIR}/locks" piddir="\${VARDIR}/locks" + mandir="\${prefix}/man" privatedir="\${prefix}/private" swatdir="\${prefix}/swat") @@ -79,6 +81,23 @@ AC_ARG_WITH(piddir, esac]) ################################################# +# set pid directory location +AC_ARG_WITH(piddir, +[ --with-mandir=DIR Where to put man pages ($ac_default_prefix/man)], +[ case "$withval" in + yes|no) + # + # Just in case anybody calls it without argument + # + AC_MSG_WARN([--with-mandir called without argument - will use default]) + ;; + * ) + piddir="$withval" + ;; + esac]) + + +################################################# # set SWAT directory location AC_ARG_WITH(swatdir, [ --with-swatdir=DIR Where to put SWAT files ($ac_default_prefix/swat)], @@ -148,6 +167,7 @@ done AC_SUBST(configdir) AC_SUBST(lockdir) AC_SUBST(piddir) +AC_SUBST(mandir) AC_SUBST(logfilebase) AC_SUBST(privatedir) AC_SUBST(swatdir) diff --git a/source3/nsswitch/winbindd_group.c b/source3/nsswitch/winbindd_group.c index fba427536c..1c5d6acf51 100644 --- a/source3/nsswitch/winbindd_group.c +++ b/source3/nsswitch/winbindd_group.c @@ -691,8 +691,8 @@ enum winbindd_result winbindd_getgrent(struct winbindd_cli_state *state) goto tryagain; } - DEBUG(10, ("got gid %lu for group %x\n", (unsigned long)group_gid, - name_list[ent->sam_entry_index].rid)); + DEBUG(10, ("got gid %lu for group %lu\n", (unsigned long)group_gid, + (unsigned long)name_list[ent->sam_entry_index].rid)); /* Fill in group entry */ |