From timur@gnu.org Tue Jul 11 18:41:57 2006 Return-Path: Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DBFF316A4E5; Tue, 11 Jul 2006 18:41:57 +0000 (UTC) (envelope-from timur@gnu.org) Received: from mail.bat.ru (dzokonda.xs4all.nl [194.109.164.75]) by mx1.FreeBSD.org (Postfix) with ESMTP id 71D9043D8F; Tue, 11 Jul 2006 18:41:46 +0000 (GMT) (envelope-from timur@gnu.org) Received: from timur.home.bat.ru (account timur [192.168.0.4] verified) by mail.bat.ru (CommuniGate Pro SMTP 4.2.7) with ESMTP id 1063201; Tue, 11 Jul 2006 20:41:47 +0200 Message-Id: <1152643306.91443@timur.home.bat.ru> Date: Tue, 11 Jul 2006 20:41:46 +0200 From: "Timur I. Bakeyev" To: "FreeBSD gnats submit" Cc: "Simon L. Nielsen" Subject: [Maintainer Update] Samba3.0.23 X-Send-Pr-Version: gtk-send-pr 0.4.6 X-GNATS-Notify: >Number: 100100 >Category: ports >Synopsis: [Maintainer Update] Samba3.0.23 >Confidential: no >Severity: critical >Priority: high >Responsible: kuriyama >State: closed >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Jul 11 18:50:16 GMT 2006 >Closed-Date: Wed Jul 12 00:36:50 GMT 2006 >Last-Modified: Wed Jul 12 00:36:50 GMT 2006 >Originator: Timur I. Bakeyev >Release: FreeBSD 6.1-STABLE i386 >Organization: >Environment: System: FreeBSD 6.1-STABLE #0: Sun Jul 2 02:36:16 CEST 2006 root@timur.home.bat.ru:/usr/src/sys/i386/compile/COMMON >Description: New features in 3.0.23 include: o Improved 'make test' o New offline mode in winbindd. o New Kerberos support for pam_winbind.so. o New handling of unmapped users and groups. o New non-root share management tools. o Improved support for local and BUILTIN groups. o Winbind IDMAP integration with RFC2307 schema objects supported by Windows 2003 R2. o Rewritten 'net ads join' to mimic Windows XP without requiring administrative rights to join a domain. >How-To-Repeat: 20060711: AFFECTS: users of net/samba3 AUTHOR: timur@gnu.org Starting from version 3.0.23 Samba no longer supports experimental SQL and XML passdb backends. If you need this functionality, please visit http://pdbsql.sourceforge.net/ (port is coming soon). The default mapping entries for groups such as "Domain Admins" are no longer created when using an smbpasswd file or a tdbsam passdb backend. Use 'net groupmap add' rather than 'net groupmap modify' to set these entries. A substring matching rule has been added to the sambaSID attribute definition. For OpenLDAP servers, this will require the addition of 'index sambaSID sub' to the slapd.conf configuration file. It will be necessary to run slapindex after making this change. There has been no change to actual data storage schema. >Fix: --- samba3.diff begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net/samba3/Makefile,v retrieving revision 1.149 diff -u -r1.149 Makefile --- Makefile 5 Apr 2006 03:14:26 -0000 1.149 +++ Makefile 11 Jul 2006 10:07:33 -0000 @@ -6,7 +6,7 @@ # PORTNAME= samba -PORTVERSION?= 3.0.22 +PORTVERSION?= 3.0.23 PORTREVISION?= 0 PORTEPOCH?= 1 CATEGORIES?= net @@ -46,6 +46,7 @@ CONFIGURE_ARGS+= --exec-prefix=${PREFIX} \ --localstatedir=${VARDIR} \ --with-configdir=${SAMBA_CONFDIR} \ + --with-pammodulesdir=${SAMBA_LIBDIR} \ --with-libdir=${SAMBA_LIBDIR}/samba \ --with-swatdir=${SAMBA_SWATDIR} \ --with-piddir=${SAMBA_RUNDIR} \ @@ -67,12 +68,8 @@ QUOTAS "With Quota support" off \ UTMP "With UTMP support" on \ MSDFS "With MSDFS support" off \ - SAM_XML "With XML smbpasswd backend" off \ - SAM_MYSQL "With MYSQL smbpasswd backend" off \ - SAM_PGSQL "With PostgreSQL smbpasswd backend" off \ - SAM_OLD_LDAP "With Samba2.x LDAP legacy smbpasswd backend" off \ SMBSH "With SMBSH wrapper for UNIX commands" off \ - PAM_SMBPASS "With SMB PAM module" off \ + PAM_SMBPASS "With PAM authentication against passdb backends" off \ EXP_MODULES "With experimental module(s)" off \ POPT "With system-wide POPT library" on .endif @@ -93,19 +90,21 @@ .else # Samba server itself -USE_RC_SUBR= yes +USE_RC_SUBR= samba +SUB_FILES= smb.conf.sample CONFIGURE_ARGS+= --with-pam --with-readline --with-sendfile-support \ --without-libsmbclient --without-libmsrpc \ - --without-libsmbsharemodes --without-python + --without-libsmbsharemodes --without-python \ + --with-included-iniparser .if !defined(WITHOUT_CUPS) LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base CONFIGURE_ARGS+= --enable-cups -CUPS= cups +CUPSD= cupsd .else CONFIGURE_ARGS+= --disable-cups -CUPS= "" +CUPSD= "" .endif .if defined(WITH_SYSLOG) @@ -131,12 +130,14 @@ .if !defined(WITHOUT_WINBIND) CONFIGURE_ARGS+= --with-winbind PLIST_SUB+= WINBIND="" +SUB_LIST+= WINBIND="" .if ${OSVERSION} >= 500112 WITH_WINBIND_NSS= yes .endif .else CONFIGURE_ARGS+= --without-winbind PLIST_SUB+= WINBIND="@comment " +SUB_LIST+= WINBIND="@comment " .endif .if defined(WITH_WINBIND_NSS) @@ -148,46 +149,7 @@ .if !defined(WITHOUT_LDAP) WANT_LDAP= yes .endif -# SAM -.if defined(WITH_SAM_XML) -LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2 -CONFIGURE_ARGS+= --with-xml-prefix=${LOCALBASE} -WANT_EXPSAM_MODULES+= xml -PLIST_SUB+= SAMXML="" -.else -PLIST_SUB+= SAMXML="@comment " -.endif - -.if defined(WITH_SAM_MYSQL) -USE_MYSQL= yes -CONFIGURE_ARGS+= --with-mysql-prefix=${LOCALBASE} -WANT_EXPSAM_MODULES+= mysql -PLIST_SUB+= SAMMYSQL="" -.else -PLIST_SUB+= SAMMYSQL="@comment " -.endif -.if defined(WITH_SAM_PGSQL) -USE_PGSQL= yes -CONFIGURE_ARGS+= --with-pgsql-prefix=${LOCALBASE} -WANT_EXPSAM_MODULES+= pgsql -PLIST_SUB+= SAMPGSQL="" -.else -PLIST_SUB+= SAMPGSQL="@comment " -.endif - -.if defined(WITH_SAM_OLD_LDAP) -WANT_LDAP= yes -CONFIGURE_ARGS+= --with-ldapsam -.else -CONFIGURE_ARGS+= --without-ldapsam -.endif - -.if defined(WANT_EXPSAM_MODULES) && !empty(WANT_EXPSAM_MODULES) -WANT_EXPSAM_MODULES!= ${ECHO_CMD} ${WANT_EXPSAM_MODULES} | ${SED} -E 's/ +/,/g' -CONFIGURE_ARGS+= --with-expsam=${WANT_EXPSAM_MODULES} -.endif -# SAM .if defined(WITH_EXP_MODULES) .if !defined(WANT_EXP_MODULES) || empty(WANT_EXP_MODULES) WANT_EXP_MODULES= rpc_echo idmap_ad idmap_rid charset_weird @@ -222,7 +184,7 @@ .if defined(WITH_AIO_SUPPORT) IGNORE= broken kernel API until now (7-CURRENT) -CONFIGURE_ARGS+= --without-aio-support +CONFIGURE_ARGS+= --with-aio-support .endif .if !defined(WITHOUT_POPT) @@ -293,20 +255,13 @@ MAN8+= winbindd.8 .endif -.if !defined(WITHOUT_WINBIND) -WINBIND_FILTER= ${SED} -e 's|%%WINBIND%%||g' -.else -WINBIND_FILTER= ${GREP} -v '^%%WINBIND%%' -.endif PLIST_SUB+= RC_DIR=${RC_DIR} \ SAMBA_LOGDIR=${SAMBA_LOGDIR} \ SAMBA_LOCKDIR=${SAMBA_LOCKDIR} \ SAMBA_CONFIG=${SAMBA_CONFIG} -RC_SCRIPTS_SUB= PREFIX=${PREFIX} \ - CUPS=${CUPS} \ - RC_SUBR=${RC_SUBR} \ +SUB_LIST+= CUPSD=${CUPSD} \ SAMBA_CONFDIR=${SAMBA_CONFDIR} \ SAMBA_CONFIG=${SAMBA_CONFIG} \ SAMBA_LOGDIR=${SAMBA_LOGDIR} \ @@ -314,6 +269,7 @@ SAMBA_LOCKDIR=${SAMBA_LOCKDIR} \ SAMBA_SPOOL=${SAMBA_SPOOL} +PLIST_SUB+= SMBSH="@comment " pre-fetch: @${ECHO_MSG} "===> -------------------------------------------" @${ECHO_MSG} "===> Run 'make config' to (re)configure the port" @@ -345,26 +301,24 @@ @${MKDIR} ${EXAMPLESDIR}/pam_smbpass @${CP} -Rp ${WRKSRC}/pam_smbpass/samples/* ${EXAMPLESDIR}/pam_smbpass .endif - @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${FILESDIR}/samba.sh.sample | ${WINBIND_FILTER} > ${WRKDIR}/samba.sh - ${INSTALL_SCRIPT} ${WRKDIR}/samba.sh ${RC_DIR}/samba.sh - @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${FILESDIR}/smb.conf.default > ${WRKDIR}/smb.conf.default - ${INSTALL_DATA} ${WRKDIR}/smb.conf.default ${SAMBA_CONFIG}.default + ${INSTALL_DATA} ${WRKDIR}/smb.conf.sample ${SAMBA_CONFDIR} + @if [ ! -f ${SAMBA_CONFIG} ]; then \ + ${INSTALL_DATA} ${WRKDIR}/smb.conf.sample ${SAMBA_CONFIG} ; \ + fi ${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh ${PREFIX}/bin/make_smbpasswd .if !defined(WITHOUT_WINBIND) .if defined(WITH_WINBIND_NSS) ${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/nss_winbind.so ${SAMBA_LIBDIR}/nss_winbind.so.1 ${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/nss_wins.so ${SAMBA_LIBDIR}/nss_wins.so.1 - ${ECHO_CMD} "${SAMBA_LIB}/nss_winbind.so.1" >> ${TMPPLIST}; - ${ECHO_CMD} "${SAMBA_LIB}/nss_wins.so.1" >> ${TMPPLIST}; + @${ECHO_CMD} "${SAMBA_LIB}/nss_winbind.so.1" >> ${TMPPLIST}; + @${ECHO_CMD} "${SAMBA_LIB}/nss_wins.so.1" >> ${TMPPLIST}; .endif - ${INSTALL_PROGRAM} ${WRKSRC}/nsswitch/pam_winbind.so ${SAMBA_LIBDIR} - ${ECHO_CMD} "${SAMBA_LIB}/pam_winbind.so" >> ${TMPPLIST}; + ${INSTALL_PROGRAM} ${WRKSRC}/bin/pam_winbind.so ${SAMBA_LIBDIR} + @${ECHO_CMD} "${SAMBA_LIB}/pam_winbind.so" >> ${TMPPLIST}; .endif .if defined(WITH_PAM_SMBPASS) ${INSTALL_PROGRAM} ${WRKSRC}/bin/pam_smbpass.so ${SAMBA_LIBDIR} - ${ECHO_CMD} "${SAMBA_LIB}/pam_smbpass.so" >> ${TMPPLIST}; + @${ECHO_CMD} "${SAMBA_LIB}/pam_smbpass.so" >> ${TMPPLIST}; .endif # smbwrapper.so .if defined(WITH_SMBSH) Index: distinfo =================================================================== RCS file: /home/ncvs/ports/net/samba3/distinfo,v retrieving revision 1.69 diff -u -r1.69 distinfo --- distinfo 5 Apr 2006 03:14:26 -0000 1.69 +++ distinfo 10 Jul 2006 23:59:00 -0000 @@ -1,3 +1,3 @@ -MD5 (samba-3.0.22.tar.gz) = 5c39505af17cf5caf3d6ed8bab135036 -SHA256 (samba-3.0.22.tar.gz) = 781466885804343248afb74dfdd57df0c7165b252ded06a71c0f24827b2a8e2d -SIZE (samba-3.0.22.tar.gz) = 17542657 +MD5 (samba-3.0.23.tar.gz) = f2f8722248021ca0e8f31b1853d3bf66 +SHA256 (samba-3.0.23.tar.gz) = a198213c44c9837169916c82a885c9916e1627c5dc2285663998f8c307d8590e +SIZE (samba-3.0.23.tar.gz) = 17677551 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/net/samba3/pkg-plist,v retrieving revision 1.64 diff -u -r1.64 pkg-plist --- pkg-plist 5 Apr 2006 03:14:26 -0000 1.64 +++ pkg-plist 11 Jul 2006 01:24:59 -0000 @@ -23,10 +23,9 @@ bin/testparm %%SMBSH%%bin/smbsh %%WINBIND%%bin/wbinfo -@unexec %D/etc/rc.d/samba.sh forcestop 2>/dev/null || true -etc/rc.d/samba.sh -@unexec if cmp -s %%SAMBA_CONFIG%% %%SAMBA_CONFIG%%.default; then rm -f %%SAMBA_CONFIG%%; fi -@unexec rm -f %%SAMBA_CONFIG%%.default +@unexec %D/etc/rc.d/samba forcestop 2>/dev/null || true +@unexec if cmp -s %%SAMBA_CONFIG%% %%SAMBA_CONFIG%%.sample; then rm -f %%SAMBA_CONFIG%%; fi +@unexec rm -f %%SAMBA_CONFIG%%.sample sbin/smbd sbin/nmbd sbin/swat @@ -76,11 +75,9 @@ %%EXAMPLESDIR%%/nss/nss_winbind.c %%EXAMPLESDIR%%/nss/nss_winbind.h %%EXAMPLESDIR%%/nss/wbtest.c +%%EXAMPLESDIR%%/pam_winbind/pam_winbind.conf %%EXAMPLESDIR%%/pdb/Makefile %%EXAMPLESDIR%%/pdb/README -%%EXAMPLESDIR%%/pdb/mysql/mysql.dump -%%EXAMPLESDIR%%/pdb/mysql/smb.conf -%%EXAMPLESDIR%%/pdb/sambapdb.dtd %%EXAMPLESDIR%%/pdb/test.c %%EXAMPLESDIR%%/perfcounter/Makefile %%EXAMPLESDIR%%/perfcounter/perf.h @@ -145,8 +142,8 @@ @dirrm %%EXAMPLESDIR%%/printing @dirrm %%EXAMPLESDIR%%/printer-accounting @dirrm %%EXAMPLESDIR%%/perfcounter -@dirrm %%EXAMPLESDIR%%/pdb/mysql @dirrm %%EXAMPLESDIR%%/pdb +@dirrm %%EXAMPLESDIR%%/pam_winbind @dirrm %%EXAMPLESDIR%%/nss @dirrm %%EXAMPLESDIR%%/misc @dirrm %%EXAMPLESDIR%%/logon/ntlogon @@ -280,6 +277,7 @@ share/swat/help/Samba3-HOWTO/Appendix.html share/swat/help/Samba3-HOWTO/Backup.html share/swat/help/Samba3-HOWTO/CUPS-printing.html +share/swat/help/Samba3-HOWTO/ChangeNotes.html share/swat/help/Samba3-HOWTO/ClientConfig.html share/swat/help/Samba3-HOWTO/DNSDHCP.html share/swat/help/Samba3-HOWTO/FastStart.html @@ -301,7 +299,7 @@ share/swat/help/Samba3-HOWTO/bugreport.html share/swat/help/Samba3-HOWTO/cfgsmarts.html share/swat/help/Samba3-HOWTO/ch-ldap-tls.html -share/swat/help/Samba3-HOWTO/ch45.html +share/swat/help/Samba3-HOWTO/ch46.html share/swat/help/Samba3-HOWTO/classicalprinting.html share/swat/help/Samba3-HOWTO/compiling.html share/swat/help/Samba3-HOWTO/diagnosis.html @@ -430,169 +428,6 @@ share/swat/help/manpages/vfstest.1.html share/swat/help/manpages/wbinfo.1.html share/swat/help/manpages/winbindd.8.html -share/swat/help/using_samba/appa.html -share/swat/help/using_samba/appb.html -share/swat/help/using_samba/appc.html -share/swat/help/using_samba/appd.html -share/swat/help/using_samba/appe.html -share/swat/help/using_samba/appf.html -share/swat/help/using_samba/appg.html -share/swat/help/using_samba/ch00.html -share/swat/help/using_samba/ch01.html -share/swat/help/using_samba/ch02.html -share/swat/help/using_samba/ch03.html -share/swat/help/using_samba/ch04.html -share/swat/help/using_samba/ch05.html -share/swat/help/using_samba/ch06.html -share/swat/help/using_samba/ch07.html -share/swat/help/using_samba/ch08.html -share/swat/help/using_samba/ch09.html -share/swat/help/using_samba/ch10.html -share/swat/help/using_samba/ch11.html -share/swat/help/using_samba/ch12.html -share/swat/help/using_samba/figs/sam2_0101.gif -share/swat/help/using_samba/figs/sam2_0102.gif -share/swat/help/using_samba/figs/sam2_0103.gif -share/swat/help/using_samba/figs/sam2_0104.gif -share/swat/help/using_samba/figs/sam2_0105.gif -share/swat/help/using_samba/figs/sam2_0106.gif -share/swat/help/using_samba/figs/sam2_0107.gif -share/swat/help/using_samba/figs/sam2_0108.gif -share/swat/help/using_samba/figs/sam2_0109.gif -share/swat/help/using_samba/figs/sam2_0110.gif -share/swat/help/using_samba/figs/sam2_0111.gif -share/swat/help/using_samba/figs/sam2_0112.gif -share/swat/help/using_samba/figs/sam2_0113.gif -share/swat/help/using_samba/figs/sam2_0114.gif -share/swat/help/using_samba/figs/sam2_0201.gif -share/swat/help/using_samba/figs/sam2_0202.gif -share/swat/help/using_samba/figs/sam2_0203.gif -share/swat/help/using_samba/figs/sam2_0204.gif -share/swat/help/using_samba/figs/sam2_0301.gif -share/swat/help/using_samba/figs/sam2_0302.gif -share/swat/help/using_samba/figs/sam2_0303.gif -share/swat/help/using_samba/figs/sam2_0304.gif -share/swat/help/using_samba/figs/sam2_0305.gif -share/swat/help/using_samba/figs/sam2_0306.gif -share/swat/help/using_samba/figs/sam2_0307.gif -share/swat/help/using_samba/figs/sam2_0308.gif -share/swat/help/using_samba/figs/sam2_0309.gif -share/swat/help/using_samba/figs/sam2_0310.gif -share/swat/help/using_samba/figs/sam2_0311.gif -share/swat/help/using_samba/figs/sam2_0312.gif -share/swat/help/using_samba/figs/sam2_0313.gif -share/swat/help/using_samba/figs/sam2_0314.gif -share/swat/help/using_samba/figs/sam2_0315.gif -share/swat/help/using_samba/figs/sam2_0316.gif -share/swat/help/using_samba/figs/sam2_0317.gif -share/swat/help/using_samba/figs/sam2_0318.gif -share/swat/help/using_samba/figs/sam2_0319.gif -share/swat/help/using_samba/figs/sam2_0320.gif -share/swat/help/using_samba/figs/sam2_0321.gif -share/swat/help/using_samba/figs/sam2_0322.gif -share/swat/help/using_samba/figs/sam2_0323.gif -share/swat/help/using_samba/figs/sam2_0324.gif -share/swat/help/using_samba/figs/sam2_0325.gif -share/swat/help/using_samba/figs/sam2_0326.gif -share/swat/help/using_samba/figs/sam2_0327.gif -share/swat/help/using_samba/figs/sam2_0328.gif -share/swat/help/using_samba/figs/sam2_0329.gif -share/swat/help/using_samba/figs/sam2_0330.gif -share/swat/help/using_samba/figs/sam2_0331.gif -share/swat/help/using_samba/figs/sam2_0332.gif -share/swat/help/using_samba/figs/sam2_0333.gif -share/swat/help/using_samba/figs/sam2_0334.gif -share/swat/help/using_samba/figs/sam2_0335.gif -share/swat/help/using_samba/figs/sam2_0336.gif -share/swat/help/using_samba/figs/sam2_0337.gif -share/swat/help/using_samba/figs/sam2_0338.gif -share/swat/help/using_samba/figs/sam2_0339.gif -share/swat/help/using_samba/figs/sam2_0340.gif -share/swat/help/using_samba/figs/sam2_0341.gif -share/swat/help/using_samba/figs/sam2_0342.gif -share/swat/help/using_samba/figs/sam2_0343.gif -share/swat/help/using_samba/figs/sam2_0344.gif -share/swat/help/using_samba/figs/sam2_0345.gif -share/swat/help/using_samba/figs/sam2_0346.gif -share/swat/help/using_samba/figs/sam2_0347.gif -share/swat/help/using_samba/figs/sam2_0348.gif -share/swat/help/using_samba/figs/sam2_0349.gif -share/swat/help/using_samba/figs/sam2_0350.gif -share/swat/help/using_samba/figs/sam2_0351.gif -share/swat/help/using_samba/figs/sam2_0352.gif -share/swat/help/using_samba/figs/sam2_0353.gif -share/swat/help/using_samba/figs/sam2_0354.gif -share/swat/help/using_samba/figs/sam2_0355.gif -share/swat/help/using_samba/figs/sam2_0356.gif -share/swat/help/using_samba/figs/sam2_0357.gif -share/swat/help/using_samba/figs/sam2_0358.gif -share/swat/help/using_samba/figs/sam2_0359.gif -share/swat/help/using_samba/figs/sam2_0360.gif -share/swat/help/using_samba/figs/sam2_0361.gif -share/swat/help/using_samba/figs/sam2_0401.gif -share/swat/help/using_samba/figs/sam2_0402.gif -share/swat/help/using_samba/figs/sam2_0403.gif -share/swat/help/using_samba/figs/sam2_0404.gif -share/swat/help/using_samba/figs/sam2_0405.gif -share/swat/help/using_samba/figs/sam2_0406.gif -share/swat/help/using_samba/figs/sam2_0407.gif -share/swat/help/using_samba/figs/sam2_0408.gif -share/swat/help/using_samba/figs/sam2_0409.gif -share/swat/help/using_samba/figs/sam2_0410.gif -share/swat/help/using_samba/figs/sam2_0411.gif -share/swat/help/using_samba/figs/sam2_0412.gif -share/swat/help/using_samba/figs/sam2_0413.gif -share/swat/help/using_samba/figs/sam2_0414.gif -share/swat/help/using_samba/figs/sam2_0415.gif -share/swat/help/using_samba/figs/sam2_0416.gif -share/swat/help/using_samba/figs/sam2_0417.gif -share/swat/help/using_samba/figs/sam2_0501.gif -share/swat/help/using_samba/figs/sam2_0502.gif -share/swat/help/using_samba/figs/sam2_0503.gif -share/swat/help/using_samba/figs/sam2_0504.gif -share/swat/help/using_samba/figs/sam2_0505.gif -share/swat/help/using_samba/figs/sam2_0506.gif -share/swat/help/using_samba/figs/sam2_0507.gif -share/swat/help/using_samba/figs/sam2_0508.gif -share/swat/help/using_samba/figs/sam2_0601.gif -share/swat/help/using_samba/figs/sam2_0602.gif -share/swat/help/using_samba/figs/sam2_0603.gif -share/swat/help/using_samba/figs/sam2_0604.gif -share/swat/help/using_samba/figs/sam2_0605.gif -share/swat/help/using_samba/figs/sam2_0701.gif -share/swat/help/using_samba/figs/sam2_0801.gif -share/swat/help/using_samba/figs/sam2_0802.gif -share/swat/help/using_samba/figs/sam2_0803.gif -share/swat/help/using_samba/figs/sam2_0804.gif -share/swat/help/using_samba/figs/sam2_0805.gif -share/swat/help/using_samba/figs/sam2_0806.gif -share/swat/help/using_samba/figs/sam2_0807.gif -share/swat/help/using_samba/figs/sam2_0808.gif -share/swat/help/using_samba/figs/sam2_0809.gif -share/swat/help/using_samba/figs/sam2_0810.gif -share/swat/help/using_samba/figs/sam2_0811.gif -share/swat/help/using_samba/figs/sam2_0901.gif -share/swat/help/using_samba/figs/sam2_0902.gif -share/swat/help/using_samba/figs/sam2_0903.gif -share/swat/help/using_samba/figs/sam2_1001.gif -share/swat/help/using_samba/figs/sam2_1002.gif -share/swat/help/using_samba/figs/sam2_1003.gif -share/swat/help/using_samba/figs/sam2_1004.gif -share/swat/help/using_samba/figs/sam2_1005.gif -share/swat/help/using_samba/figs/sam2_1006.gif -share/swat/help/using_samba/figs/sam2_1101.gif -share/swat/help/using_samba/figs/sam2_1102.gif -share/swat/help/using_samba/figs/sam2_af01.gif -share/swat/help/using_samba/figs/sam2_af02.gif -share/swat/help/using_samba/figs/sam2_af03.gif -share/swat/help/using_samba/figs/sam2_af04.gif -share/swat/help/using_samba/figs/sam2_af05.gif -share/swat/help/using_samba/figs/sam2_af06.gif -share/swat/help/using_samba/figs/sam2_af07.gif -share/swat/help/using_samba/inx.html -share/swat/help/using_samba/samba2_s.gif -share/swat/help/using_samba/samba2_xs.gif -share/swat/help/using_samba/toc.html share/swat/help/welcome-no-samba-doc.html share/swat/help/welcome.html share/swat/images/globals.gif @@ -606,10 +441,174 @@ share/swat/images/wizard.gif share/swat/include/footer.html share/swat/include/header.html +share/swat/using_samba/appa.html +share/swat/using_samba/appb.html +share/swat/using_samba/appc.html +share/swat/using_samba/appd.html +share/swat/using_samba/appe.html +share/swat/using_samba/appf.html +share/swat/using_samba/appg.html +share/swat/using_samba/ch00.html +share/swat/using_samba/ch01.html +share/swat/using_samba/ch02.html +share/swat/using_samba/ch03.html +share/swat/using_samba/ch04.html +share/swat/using_samba/ch05.html +share/swat/using_samba/ch06.html +share/swat/using_samba/ch07.html +share/swat/using_samba/ch08.html +share/swat/using_samba/ch09.html +share/swat/using_samba/ch10.html +share/swat/using_samba/ch11.html +share/swat/using_samba/ch12.html +share/swat/using_samba/figs/sam2_0101.gif +share/swat/using_samba/figs/sam2_0102.gif +share/swat/using_samba/figs/sam2_0103.gif +share/swat/using_samba/figs/sam2_0104.gif +share/swat/using_samba/figs/sam2_0105.gif +share/swat/using_samba/figs/sam2_0106.gif +share/swat/using_samba/figs/sam2_0107.gif +share/swat/using_samba/figs/sam2_0108.gif +share/swat/using_samba/figs/sam2_0109.gif +share/swat/using_samba/figs/sam2_0110.gif +share/swat/using_samba/figs/sam2_0111.gif +share/swat/using_samba/figs/sam2_0112.gif +share/swat/using_samba/figs/sam2_0113.gif +share/swat/using_samba/figs/sam2_0114.gif +share/swat/using_samba/figs/sam2_0201.gif +share/swat/using_samba/figs/sam2_0202.gif +share/swat/using_samba/figs/sam2_0203.gif +share/swat/using_samba/figs/sam2_0204.gif +share/swat/using_samba/figs/sam2_0301.gif +share/swat/using_samba/figs/sam2_0302.gif +share/swat/using_samba/figs/sam2_0303.gif +share/swat/using_samba/figs/sam2_0304.gif +share/swat/using_samba/figs/sam2_0305.gif +share/swat/using_samba/figs/sam2_0306.gif +share/swat/using_samba/figs/sam2_0307.gif +share/swat/using_samba/figs/sam2_0308.gif +share/swat/using_samba/figs/sam2_0309.gif +share/swat/using_samba/figs/sam2_0310.gif +share/swat/using_samba/figs/sam2_0311.gif +share/swat/using_samba/figs/sam2_0312.gif +share/swat/using_samba/figs/sam2_0313.gif +share/swat/using_samba/figs/sam2_0314.gif +share/swat/using_samba/figs/sam2_0315.gif +share/swat/using_samba/figs/sam2_0316.gif +share/swat/using_samba/figs/sam2_0317.gif +share/swat/using_samba/figs/sam2_0318.gif +share/swat/using_samba/figs/sam2_0319.gif +share/swat/using_samba/figs/sam2_0320.gif +share/swat/using_samba/figs/sam2_0321.gif +share/swat/using_samba/figs/sam2_0322.gif +share/swat/using_samba/figs/sam2_0323.gif +share/swat/using_samba/figs/sam2_0324.gif +share/swat/using_samba/figs/sam2_0325.gif +share/swat/using_samba/figs/sam2_0326.gif +share/swat/using_samba/figs/sam2_0327.gif +share/swat/using_samba/figs/sam2_0328.gif +share/swat/using_samba/figs/sam2_0329.gif +share/swat/using_samba/figs/sam2_0330.gif +share/swat/using_samba/figs/sam2_0331.gif +share/swat/using_samba/figs/sam2_0332.gif +share/swat/using_samba/figs/sam2_0333.gif +share/swat/using_samba/figs/sam2_0334.gif +share/swat/using_samba/figs/sam2_0335.gif +share/swat/using_samba/figs/sam2_0336.gif +share/swat/using_samba/figs/sam2_0337.gif +share/swat/using_samba/figs/sam2_0338.gif +share/swat/using_samba/figs/sam2_0339.gif +share/swat/using_samba/figs/sam2_0340.gif +share/swat/using_samba/figs/sam2_0341.gif +share/swat/using_samba/figs/sam2_0342.gif +share/swat/using_samba/figs/sam2_0343.gif +share/swat/using_samba/figs/sam2_0344.gif +share/swat/using_samba/figs/sam2_0345.gif +share/swat/using_samba/figs/sam2_0346.gif +share/swat/using_samba/figs/sam2_0347.gif +share/swat/using_samba/figs/sam2_0348.gif +share/swat/using_samba/figs/sam2_0349.gif +share/swat/using_samba/figs/sam2_0350.gif +share/swat/using_samba/figs/sam2_0351.gif +share/swat/using_samba/figs/sam2_0352.gif +share/swat/using_samba/figs/sam2_0353.gif +share/swat/using_samba/figs/sam2_0354.gif +share/swat/using_samba/figs/sam2_0355.gif +share/swat/using_samba/figs/sam2_0356.gif +share/swat/using_samba/figs/sam2_0357.gif +share/swat/using_samba/figs/sam2_0358.gif +share/swat/using_samba/figs/sam2_0359.gif +share/swat/using_samba/figs/sam2_0360.gif +share/swat/using_samba/figs/sam2_0361.gif +share/swat/using_samba/figs/sam2_0401.gif +share/swat/using_samba/figs/sam2_0402.gif +share/swat/using_samba/figs/sam2_0403.gif +share/swat/using_samba/figs/sam2_0404.gif +share/swat/using_samba/figs/sam2_0405.gif +share/swat/using_samba/figs/sam2_0406.gif +share/swat/using_samba/figs/sam2_0407.gif +share/swat/using_samba/figs/sam2_0408.gif +share/swat/using_samba/figs/sam2_0409.gif +share/swat/using_samba/figs/sam2_0410.gif +share/swat/using_samba/figs/sam2_0411.gif +share/swat/using_samba/figs/sam2_0412.gif +share/swat/using_samba/figs/sam2_0413.gif +share/swat/using_samba/figs/sam2_0414.gif +share/swat/using_samba/figs/sam2_0415.gif +share/swat/using_samba/figs/sam2_0416.gif +share/swat/using_samba/figs/sam2_0417.gif +share/swat/using_samba/figs/sam2_0501.gif +share/swat/using_samba/figs/sam2_0502.gif +share/swat/using_samba/figs/sam2_0503.gif +share/swat/using_samba/figs/sam2_0504.gif +share/swat/using_samba/figs/sam2_0505.gif +share/swat/using_samba/figs/sam2_0506.gif +share/swat/using_samba/figs/sam2_0507.gif +share/swat/using_samba/figs/sam2_0508.gif +share/swat/using_samba/figs/sam2_0601.gif +share/swat/using_samba/figs/sam2_0602.gif +share/swat/using_samba/figs/sam2_0603.gif +share/swat/using_samba/figs/sam2_0604.gif +share/swat/using_samba/figs/sam2_0605.gif +share/swat/using_samba/figs/sam2_0701.gif +share/swat/using_samba/figs/sam2_0801.gif +share/swat/using_samba/figs/sam2_0802.gif +share/swat/using_samba/figs/sam2_0803.gif +share/swat/using_samba/figs/sam2_0804.gif +share/swat/using_samba/figs/sam2_0805.gif +share/swat/using_samba/figs/sam2_0806.gif +share/swat/using_samba/figs/sam2_0807.gif +share/swat/using_samba/figs/sam2_0808.gif +share/swat/using_samba/figs/sam2_0809.gif +share/swat/using_samba/figs/sam2_0810.gif +share/swat/using_samba/figs/sam2_0811.gif +share/swat/using_samba/figs/sam2_0901.gif +share/swat/using_samba/figs/sam2_0902.gif +share/swat/using_samba/figs/sam2_0903.gif +share/swat/using_samba/figs/sam2_1001.gif +share/swat/using_samba/figs/sam2_1002.gif +share/swat/using_samba/figs/sam2_1003.gif +share/swat/using_samba/figs/sam2_1004.gif +share/swat/using_samba/figs/sam2_1005.gif +share/swat/using_samba/figs/sam2_1006.gif +share/swat/using_samba/figs/sam2_1101.gif +share/swat/using_samba/figs/sam2_1102.gif +share/swat/using_samba/figs/sam2_af01.gif +share/swat/using_samba/figs/sam2_af02.gif +share/swat/using_samba/figs/sam2_af03.gif +share/swat/using_samba/figs/sam2_af04.gif +share/swat/using_samba/figs/sam2_af05.gif +share/swat/using_samba/figs/sam2_af06.gif +share/swat/using_samba/figs/sam2_af07.gif +share/swat/using_samba/inx.html +share/swat/using_samba/samba2_s.gif +share/swat/using_samba/samba2_xs.gif +share/swat/using_samba/toc.html +@dirrm share/swat/using_samba/figs +@dirrm share/swat/using_samba +@dirrm share/swat/js @dirrm share/swat/include @dirrm share/swat/images -@dirrm share/swat/help/using_samba/figs -@dirrm share/swat/help/using_samba @dirrm share/swat/help/manpages @dirrm share/swat/help/Samba3-HOWTO/images @dirrm share/swat/help/Samba3-HOWTO Index: files/patch-Makefile.in =================================================================== RCS file: /home/ncvs/ports/net/samba3/files/patch-Makefile.in,v retrieving revision 1.7 diff -u -r1.7 patch-Makefile.in --- files/patch-Makefile.in 5 Apr 2006 03:14:27 -0000 1.7 +++ files/patch-Makefile.in 26 Apr 2006 00:21:52 -0000 @@ -1,11 +1,11 @@ ---- Makefile.in.orig Mon Feb 20 21:33:23 2006 -+++ Makefile.in Sat Feb 25 05:30:42 2006 -@@ -1390,7 +1390,7 @@ +--- Makefile.in.orig Thu Apr 20 04:29:46 2006 ++++ Makefile.in Tue Apr 25 01:05:05 2006 +@@ -1410,7 +1410,7 @@ + @echo Linking $@ + @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) script/tests/timelimit.o - bin/t_snprintf@EXEEXT@: lib/snprintf.c - $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) -DTEST_SNPRINTF lib/snprintf.c -lm --install: installbin installman installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ -+install: installbin installscripts installdat installswat installmodules +-install: installservers installbin @INSTALL_CIFSMOUNT@ installman installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ @INSTALL_PAM_MODULES@ ++install: installservers installbin installscripts installdat installswat installmodules install-everything: install installmodules Index: files/patch-configure.in =================================================================== RCS file: /home/ncvs/ports/net/samba3/files/patch-configure.in,v retrieving revision 1.16 diff -u -r1.16 patch-configure.in --- files/patch-configure.in 5 Apr 2006 03:14:27 -0000 1.16 +++ files/patch-configure.in 26 Jun 2006 23:19:44 -0000 @@ -1,6 +1,14 @@ ---- configure.in.orig Mon Feb 20 21:33:23 2006 -+++ configure.in Sat Feb 25 05:34:56 2006 -@@ -968,6 +968,21 @@ +--- configure.in.orig Fri Jun 23 15:16:53 2006 ++++ configure.in Tue Jun 27 01:17:29 2006 +@@ -242,7 +242,6 @@ + AC_SUBST(SHELL) + AC_SUBST(LDSHFLAGS) + AC_SUBST(SONAMEFLAG) +-AC_SUBST(NSSSONAMEVERSIONSUFFIX) + AC_SUBST(SHLD) + AC_SUBST(HOST_OS) + AC_SUBST(PICFLAGS) +@@ -1089,6 +1088,21 @@ AC_DEFINE(HAVE_SIG_ATOMIC_T_TYPE,1,[Whether we have the atomic_t variable type]) fi @@ -22,25 +30,69 @@ AC_CACHE_CHECK([for struct timespec type],samba_cv_struct_timespec, [ AC_TRY_COMPILE([ #include -@@ -1408,7 +1423,6 @@ +@@ -1639,7 +1653,6 @@ + HOST_OS="$host_os" + LDSHFLAGS="-shared" + SONAMEFLAG="#" +-NSSSONAMEVERSIONSUFFIX="" + SHLD="\${CC} \${CFLAGS}" + PICFLAGS="" + PICSUFFIX="po" +@@ -1664,7 +1677,6 @@ DYNEXP="-Wl,--export-dynamic" PICFLAGS="-fPIC" SONAMEFLAG="-Wl,-soname=" -- SONAMEVERSIONSUFFIX=".2" +- NSSSONAMEVERSIONSUFFIX=".2" AC_DEFINE(STAT_ST_BLOCKSIZE,512) ;; *solaris*) AC_DEFINE(SUNOS5,1,[Whether the host os is solaris]) -@@ -4911,11 +4925,13 @@ +@@ -1674,7 +1686,6 @@ + if test "${GCC}" = "yes"; then + PICFLAGS="-fPIC" + SONAMEFLAG="-Wl,-soname=" +- NSSSONAMEVERSIONSUFFIX=".1" + if test "${ac_cv_prog_gnu_ld}" = "yes"; then + DYNEXP="-Wl,-E" + fi +@@ -4868,6 +4879,7 @@ + AC_MSG_RESULT(yes) + case "$host_os" in + *) ++ AIO_LIBS=$LIBS + AC_CHECK_LIB(rt,aio_read,[AIO_LIBS="$LIBS -lrt"]) + AC_CHECK_LIB(aio,aio_read,[AIO_LIBS="$LIBS -laio"]) + AC_CACHE_CHECK([for asynchronous io support],samba_cv_HAVE_AIO,[ +@@ -5268,14 +5280,17 @@ + WINBIND_NSS="nsswitch/libnss_winbind.$SHLIBEXT" + WINBIND_WINS_NSS="nsswitch/libnss_wins.$SHLIBEXT" + WINBIND_NSS_LDSHFLAGS=$LDSHFLAGS ++NSSSONAMEVERSIONSUFFIX="" case "$host_os" in *linux*) -+ SONAMEVERSIONSUFFIX=".2" ++ NSSSONAMEVERSIONSUFFIX=".2" WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o" ;; *freebsd[[5-9]]*) # FreeBSD winbind client is implemented as a wrapper around # the Linux version. -+ SONAMEVERSIONSUFFIX=".1" ++ NSSSONAMEVERSIONSUFFIX=".1" WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \ nsswitch/winbind_nss_linux.o" WINBIND_NSS="nsswitch/nss_winbind.$SHLIBEXT" +@@ -5290,6 +5305,7 @@ + *solaris*) + # Solaris winbind client is implemented as a wrapper around + # the Linux version. ++ NSSSONAMEVERSIONSUFFIX=".1" + WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_solaris.o \ + nsswitch/winbind_nss_linux.o" + WINBIND_NSS_EXTRA_LIBS="-lsocket" +@@ -5316,6 +5332,7 @@ + AC_SUBST(WINBIND_NSS_LDSHFLAGS) + AC_SUBST(WINBIND_NSS_EXTRA_OBJS) + AC_SUBST(WINBIND_NSS_EXTRA_LIBS) ++AC_SUBST(NSSSONAMEVERSIONSUFFIX) + + # Check the setting of --with-winbind + Index: files/patch-nsswitch_pam_winbind.c =================================================================== RCS file: /home/ncvs/ports/net/samba3/files/patch-nsswitch_pam_winbind.c,v retrieving revision 1.1 diff -u -r1.1 patch-nsswitch_pam_winbind.c --- files/patch-nsswitch_pam_winbind.c 9 Jan 2006 16:45:33 -0000 1.1 +++ files/patch-nsswitch_pam_winbind.c 28 May 2006 00:22:38 -0000 @@ -1,36 +1,20 @@ ---- nsswitch/pam_winbind.c.orig Thu Sep 29 23:52:42 2005 -+++ nsswitch/pam_winbind.c Mon Jan 2 03:40:23 2006 -@@ -86,7 +86,7 @@ - struct pam_response *resp; - - pmsg[0] = &msg[0]; -- msg[0].msg = text; -+ msg[0].msg = CONST_DISCARD(char *, text); - msg[0].msg_style = type; - - resp = NULL; -@@ -359,7 +359,7 @@ - if (comment != NULL) { - pmsg[0] = &msg[0]; - msg[0].msg_style = PAM_TEXT_INFO; -- msg[0].msg = comment; -+ msg[0].msg = CONST_DISCARD(char *, comment); - i = 1; - } else { - i = 0; -@@ -367,13 +367,13 @@ - - pmsg[i] = &msg[i]; - msg[i].msg_style = PAM_PROMPT_ECHO_OFF; -- msg[i++].msg = prompt1; -+ msg[i++].msg = CONST_DISCARD(char *, prompt1); - replies = 1; - - if (prompt2 != NULL) { - pmsg[i] = &msg[i]; - msg[i].msg_style = PAM_PROMPT_ECHO_OFF; -- msg[i++].msg = prompt2; -+ msg[i++].msg = CONST_DISCARD(char *, prompt2); - ++replies; +--- nsswitch/pam_winbind.c.orig Sun May 28 02:21:10 2006 ++++ nsswitch/pam_winbind.c Sun May 28 02:22:16 2006 +@@ -997,7 +997,7 @@ } - /* so call the conversation expecting i responses */ + return PAM_USER_UNKNOWN; + case 0: +- pam_get_data( pamh, PAM_WINBIND_NEW_AUTHTOK_REQD, (const void **)&tmp); ++ pam_get_data( pamh, PAM_WINBIND_NEW_AUTHTOK_REQD, (void **)&tmp); + if (tmp != NULL) { + retval = atoi(tmp); + switch (retval) { +@@ -1300,7 +1300,7 @@ + * By reaching here we have approved the passwords and must now + * rebuild the password database file. + */ +- pam_get_data( pamh, PAM_WINBIND_PWD_LAST_SET, (const void **)&pwdlastset_update); ++ pam_get_data( pamh, PAM_WINBIND_PWD_LAST_SET, (void **)&pwdlastset_update); + + retval = winbind_chauthtok_request(pamh, ctrl, user, pass_old, pass_new, pwdlastset_update); + if (retval) { Index: files/patch-pam_smbpass =================================================================== RCS file: /home/ncvs/ports/net/samba3/files/patch-pam_smbpass,v retrieving revision 1.1 diff -u -r1.1 patch-pam_smbpass --- files/patch-pam_smbpass 9 Jan 2006 16:45:33 -0000 1.1 +++ files/patch-pam_smbpass 28 May 2006 00:25:40 -0000 @@ -1,19 +1,6 @@ ---- pam_smbpass/general.h.orig Fri Feb 25 18:59:30 2005 -+++ pam_smbpass/general.h Mon Jan 2 03:47:49 2006 -@@ -50,10 +50,6 @@ - #define set(x,ctrl) (ctrl = ((ctrl)&smb_args[x].mask)|smb_args[x].flag) - #define unset(x,ctrl) (ctrl &= ~(smb_args[x].flag)) - --#ifndef __linux__ --#define strncasecmp(s1,s2,n) StrnCaseCmp(s1,s2,n) --#endif -- - /* the generic mask */ - #define _ALL_ON_ (~0U) - ---- pam_smbpass/pam_smb_auth.c.orig Tue Oct 18 04:44:59 2005 -+++ pam_smbpass/pam_smb_auth.c Mon Jan 2 03:47:49 2006 -@@ -163,7 +163,7 @@ +--- pam_smbpass/pam_smb_auth.c.orig Thu Apr 20 04:29:22 2006 ++++ pam_smbpass/pam_smb_auth.c Sat May 27 01:57:31 2006 +@@ -164,7 +164,7 @@ retval = PAM_SUCCESS; @@ -22,9 +9,9 @@ if(pretval) { retval = *pretval; SAFE_FREE(pretval); ---- pam_smbpass/pam_smb_passwd.c.orig Thu Jul 28 15:19:44 2005 -+++ pam_smbpass/pam_smb_passwd.c Mon Jan 2 03:47:49 2006 -@@ -224,7 +224,7 @@ +--- pam_smbpass/pam_smb_passwd.c.orig Thu Apr 20 04:29:22 2006 ++++ pam_smbpass/pam_smb_passwd.c Sat May 27 01:57:31 2006 +@@ -226,7 +226,7 @@ (const void **)&pass_old ); } else { retval = pam_get_data( pamh, _SMB_OLD_AUTHTOK, @@ -33,17 +20,8 @@ if (retval == PAM_NO_MODULE_DATA) { pass_old = NULL; retval = PAM_SUCCESS; ---- pam_smbpass/support.c.orig Thu Jul 28 15:19:44 2005 -+++ pam_smbpass/support.c Mon Jan 2 03:47:49 2006 -@@ -114,7 +114,7 @@ - struct pam_response *resp; - - pmsg[0] = &msg[0]; -- msg[0].msg = text; -+ msg[0].msg = CONST_DISCARD(char *, text); - msg[0].msg_style = type; - resp = NULL; - +--- pam_smbpass/support.c.orig Sun May 28 02:23:20 2006 ++++ pam_smbpass/support.c Sun May 28 02:24:07 2006 @@ -384,7 +384,7 @@ if (newauth != NULL) { @@ -53,30 +31,6 @@ if (old != NULL) { newauth->count = old->count + 1; -@@ -515,7 +515,7 @@ - if (comment != NULL && off(SMB__QUIET, ctrl)) { - pmsg[0] = &msg[0]; - msg[0].msg_style = PAM_TEXT_INFO; -- msg[0].msg = comment; -+ msg[0].msg = CONST_DISCARD(char *, comment); - i = 1; - } else { - i = 0; -@@ -523,12 +523,12 @@ - - pmsg[i] = &msg[i]; - msg[i].msg_style = PAM_PROMPT_ECHO_OFF; -- msg[i++].msg = prompt1; -+ msg[i++].msg = CONST_DISCARD(char *, prompt1); - - if (prompt2 != NULL) { - pmsg[i] = &msg[i]; - msg[i].msg_style = PAM_PROMPT_ECHO_OFF; -- msg[i++].msg = prompt2; -+ msg[i++].msg = CONST_DISCARD(char *, prompt2); - expect = 2; - } else - expect = 1; @@ -594,7 +594,7 @@ retval = pam_set_data( pamh, data_name, (void *) token, _cleanup ); Index: files/patch-script_installbin.sh =================================================================== RCS file: files/patch-script_installbin.sh diff -N files/patch-script_installbin.sh --- files/patch-script_installbin.sh 13 Mar 2004 10:39:58 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ ---- script/installbin.sh.orig Tue Mar 9 15:33:32 2004 -+++ script/installbin.sh Tue Mar 9 15:35:43 2004 -@@ -17,8 +17,7 @@ - p2=`basename $p` - echo Installing $p as $BINDIR/$p2 - if [ -f $BINDIR/$p2 ]; then -- rm -f $BINDIR/$p2.old -- mv $BINDIR/$p2 $BINDIR/$p2.old -+ rm -f $BINDIR/$p2 $BINDIR/$p2.old - fi - cp $p $BINDIR/ - chmod $INSTALLPERMS $BINDIR/$p2 Index: files/patch-script_installbin.sh.in =================================================================== RCS file: files/patch-script_installbin.sh.in diff -N files/patch-script_installbin.sh.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-script_installbin.sh.in 25 Jun 2006 02:10:59 -0000 @@ -0,0 +1,15 @@ +--- script/installbin.sh.in.orig Sun Jun 25 04:08:55 2006 ++++ script/installbin.sh.in Sun Jun 25 04:10:00 2006 +@@ -13,11 +13,7 @@ + for p in $*; do + p2=`basename $p` + echo "Installing $p as $DESTDIR/$BINDIR/$p2 " +- if [ -f $DESTDIR/$BINDIR/$p2 ]; then +- rm -f $DESTDIR/$BINDIR/$p2.old +- mv $DESTDIR/$BINDIR/$p2 $DESTDIR/$BINDIR/$p2.old +- fi +- cp $p $DESTDIR/$BINDIR/ ++ cp -f $p $DESTDIR/$BINDIR/ + chmod $INSTALLPERMS $DESTDIR/$BINDIR/$p2 + + # this is a special case, mount needs this in a specific location Index: files/patch-script_installscripts.sh =================================================================== RCS file: files/patch-script_installscripts.sh diff -N files/patch-script_installscripts.sh --- files/patch-script_installscripts.sh 13 Mar 2004 10:39:58 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ ---- script/installscripts.sh.orig Tue Mar 9 15:35:54 2004 -+++ script/installscripts.sh Tue Mar 9 15:36:38 2004 -@@ -25,8 +25,7 @@ - p2=`basename $p` - echo Installing $BINDIR/$p2 - if [ -f $BINDIR/$p2 ]; then -- rm -f $BINDIR/$p2.old -- mv $BINDIR/$p2 $BINDIR/$p2.old -+ rm -f $BINDIR/$p2 $BINDIR/$p2.old - fi - cp $p $BINDIR/ - chmod $INSTALLPERMS $BINDIR/$p2 Index: files/patch-script_installswat.sh =================================================================== RCS file: /home/ncvs/ports/net/samba3/files/patch-script_installswat.sh,v retrieving revision 1.3 diff -u -r1.3 patch-script_installswat.sh --- files/patch-script_installswat.sh 11 Sep 2005 19:42:34 -0000 1.3 +++ files/patch-script_installswat.sh 25 Apr 2006 00:13:08 -0000 @@ -1,12 +1,12 @@ ---- script/installswat.sh.orig Thu Jul 28 19:44:16 2005 -+++ script/installswat.sh Wed Aug 3 02:33:04 2005 -@@ -8,8 +8,7 @@ - echo Installing SWAT in $SWATDIR - echo Installing the Samba Web Administration Tool +--- script/installswat.sh.orig Thu Apr 20 04:29:42 2006 ++++ script/installswat.sh Tue Apr 25 02:12:10 2006 +@@ -21,8 +21,7 @@ + ;; + esac -LANGS=". `cd $SRCDIR../swat/; /bin/echo lang/??`" --echo Installing langs are `cd $SRCDIR../swat/lang/; /bin/echo ??` +-echo "langs are `cd $SRCDIR../swat/lang/; /bin/echo ??` " +LANGS="." - for ln in $LANGS; do - SWATLANGDIR=$SWATDIR/$ln + if test "$mode" = 'install'; then + for ln in $LANGS; do Index: files/samba.in =================================================================== RCS file: files/samba.in diff -N files/samba.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/samba.in 7 Jul 2006 02:24:17 -0000 @@ -0,0 +1,107 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: nmbd smbd +%%WINBIND%%# PROVIDE: winbindd +# REQUIRE: NETWORKING SERVERS DAEMON ldconfig resolv %%CUPSD%% +# BEFORE: LOGIN +# KEYWORD: shutdown + +# +# Add the following lines to /etc/rc.conf to enable samba: +# +#samba_enable="YES" +# +# or, for fine grain control +# +#nmbd_enable="YES" +#smbd_enable="YES" +%%WINBIND%%# You need to enable winbindd separately, by adding: +%%WINBIND%%#winbindd_enable="YES" +# + +. %%RC_SUBR%% + +name=samba +rcvar=`set_rcvar` + +load_rc_config $name +# Set defaults +samba_config=${samba_config="%%SAMBA_CONFIG%%"} +# Config file is required +if [ ! -r ${samba_config} ]; then + warn "${samba_config} is not readable." + case $1 in + force*) : ;; + *) exit 1 ;; + esac +fi + +if test -n ${samba_enable=""} && checkyesno samba_enable; then + nmbd_enable=${nmbd_enable="YES"} + smbd_enable=${smbd_enable="YES"} +%%WINBIND%% # Check that winbind is actually configured +%%WINBIND%% if [ "`egrep -i '(idmap.*uid|winbind.*uid)' ${samba_config} 2>/dev/null | egrep -v [\#\;]`" ]; then +%%WINBIND%% winbindd_enable="YES" +%%WINBIND%% fi +fi + +nmbd_precmd() { + # XXX: Never delete winbindd_idmap, winbindd_cache and group_mapping + if [ -d "%%SAMBA_LOCKDIR%%" ]; then + echo "Starting SAMBA: removing stale tdbs :" + for file in connections.tdb messages.tdb sessionid.tdb \ + unexpected.tdb brlock.tdb locking.tdb namelist.debug + do + rm -vf "%%SAMBA_LOCKDIR%%/$file" + done + fi +} + +# nmbd +name=nmbd +rcvar=`set_rcvar` +command="%%PREFIX%%/sbin/${name}" +required_dirs="%%SAMBA_LOCKDIR%%" +pidfile=%%SAMBA_RUNDIR%%/${name}.pid +start_precmd="nmbd_precmd" +# Defaults +nmbd_enable=${nmbd_enable="NO"} +nmbd_flags=${nmbd_flags="-D"} +command_args="-s ${samba_config}" + +load_rc_config $name +run_rc_command "$1" +_rc_restart_done=false + +# smbd +name=smbd +rcvar=`set_rcvar` +command="%%PREFIX%%/sbin/${name}" +pidfile=%%SAMBA_RUNDIR%%/${name}.pid +start_precmd=":" +# Defaults +smbd_enable=${smbd_enable="NO"} +smbd_flags=${smbd_flags="-D"} +command_args="-s ${samba_config}" + +load_rc_config $name +run_rc_command "$1" +%%WINBIND%%_rc_restart_done=false +%%WINBIND%% +%%WINBIND%%# winbindd +%%WINBIND%%name=winbindd +%%WINBIND%%rcvar=`set_rcvar` +%%WINBIND%%command="%%PREFIX%%/sbin/${name}" +%%WINBIND%%required_dirs="%%SAMBA_LOCKDIR%%" +%%WINBIND%%pidfile=%%SAMBA_RUNDIR%%/${name}.pid +%%WINBIND%%start_precmd=":" +%%WINBIND%%# Defaults +%%WINBIND%%winbindd_enable=${winbindd_enable="NO"} +%%WINBIND%%winbindd_flags=${winbindd_flags=""} +%%WINBIND%%command_args="-s ${samba_config}" +%%WINBIND%% +%%WINBIND%%load_rc_config $name +%%WINBIND%%run_rc_command "$1" Index: files/samba.sh.sample =================================================================== RCS file: files/samba.sh.sample diff -N files/samba.sh.sample --- files/samba.sh.sample 5 Apr 2006 03:14:27 -0000 1.13 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,123 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: ports/net/samba3/files/samba.sh.sample,v 1.13 2006/04/05 03:14:27 mnag Exp $ -# - -# PROVIDE: nmbd smbd -%%WINBIND%%# PROVIDE: winbindd -# REQUIRE: NETWORKING SERVERS named ldconfig %%CUPS%% -# BEFORE: DAEMON -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable samba: -# -#samba_enable="YES" -# -# or, for fine grain control -# -#nmbd_enable="YES" -#smbd_enable="YES" -%%WINBIND%%# You need to enable winbindd separately, by adding: -%%WINBIND%%#winbindd_enable="YES" -# - -. %%RC_SUBR%% - -name=samba -rcvar=`set_rcvar` - -load_rc_config $name -# Set defaults -samba_config=${samba_config:-"%%SAMBA_CONFIG%%"} -# Config file is required -if [ ! -r ${samba_config} ]; then - warn "${samba_config} is not readable." - case $1 in - force*) : ;; - *) exit 1 ;; - esac -fi - -if test -n ${samba_enable:-""} && checkyesno samba_enable; then - nmbd_enable=${nmbd_enable:-"YES"} - smbd_enable=${smbd_enable:-"YES"} -%%WINBIND%% # Check that winbind is actually configured -%%WINBIND%% if [ "`egrep -i '(idmap.*uid|winbind.*uid)' ${samba_config} 2>/dev/null | egrep -v [\#\;]`" ]; then -%%WINBIND%% winbindd_enable="YES" -%%WINBIND%% fi -fi - -# Hack until run_rc_command() get rid of exit() -samba_stop() { - pid=$(check_pidfile ${pidfile} ${command}) - if [ -z ${pid} ]; then - echo "${name} not running? (check ${pidfile})." - return 1 - fi - echo "Stopping ${command}." - kill -${sig_stop:-TERM} ${pid} - [ $? -ne 0 ] && [ -z "$rc_force" ] && return 1 - wait_for_pids ${pid} -} - -nmbd_precmd() { - # XXX: Never delete winbindd_idmap, winbindd_cache and group_mapping - if [ -d "%%SAMBA_LOCKDIR%%" ]; then - echo "Starting SAMBA: removing stale tdbs :" - for file in connections.tdb messages.tdb sessionid.tdb \ - unexpected.tdb brlock.tdb locking.tdb namelist.debug - do - rm -vf "%%SAMBA_LOCKDIR%%/$file" - done - fi -} - -# nmbd -name=nmbd -rcvar=`set_rcvar` -command="%%PREFIX%%/sbin/${name}" -required_dirs="%%SAMBA_LOCKDIR%%" -pidfile=%%SAMBA_RUNDIR%%/${name}.pid -start_precmd="nmbd_precmd" -stop_cmd="samba_stop" -# Defaults -nmbd_enable=${nmbd_enable:-"NO"} -nmbd_flags=${nmbd_flags:-"-D"} -command_args="-s ${samba_config}" - -load_rc_config $name -run_rc_command "$1" -_rc_restart_done=false - -# smbd -name=smbd -rcvar=`set_rcvar` -command="%%PREFIX%%/sbin/${name}" -pidfile=%%SAMBA_RUNDIR%%/${name}.pid -start_precmd=":" -stop_cmd="samba_stop" -# Defaults -smbd_enable=${smbd_enable:-"NO"} -smbd_flags=${smbd_flags:-"-D"} -command_args="-s ${samba_config}" - -load_rc_config $name -run_rc_command "$1" -%%WINBIND%%_rc_restart_done=false -%%WINBIND%% -%%WINBIND%%# winbindd -%%WINBIND%%name=winbindd -%%WINBIND%%rcvar=`set_rcvar` -%%WINBIND%%command="%%PREFIX%%/sbin/${name}" -%%WINBIND%%required_dirs="%%SAMBA_LOCKDIR%%" -%%WINBIND%%pidfile=%%SAMBA_RUNDIR%%/${name}.pid -%%WINBIND%%start_precmd=":" -%%WINBIND%%stop_cmd="samba_stop" -%%WINBIND%%# Defaults -%%WINBIND%%winbindd_enable=${winbindd_enable:-"NO"} -%%WINBIND%%winbindd_flags=${winbindd_flags:-""} -%%WINBIND%%command_args="-s ${samba_config}" -%%WINBIND%% -%%WINBIND%%load_rc_config $name -%%WINBIND%%run_rc_command "$1" Index: files/smb.conf.default =================================================================== RCS file: files/smb.conf.default diff -N files/smb.conf.default --- files/smb.conf.default 9 Jan 2006 16:45:33 -0000 1.17 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,294 +0,0 @@ -# This is the main Samba configuration file. You should read the -# smb.conf(5) manual page in order to understand the options listed -# here. Samba has a huge number of configurable options (perhaps too -# many!) most of which are not shown in this example -# -# For a step to step guide on installing, configuring and using samba, -# read the Samba-HOWTO-Collection. This may be obtained from: -# http://www.samba.org/samba/docs/Samba-HOWTO-Collection.pdf -# -# Many working examples of smb.conf files can be found in the -# Samba-Guide which is generated daily and can be downloaded from: -# http://www.samba.org/samba/docs/Samba-Guide.pdf -# -# Any line which starts with a ; (semi-colon) or a # (hash) -# is a comment and is ignored. In this example we will use a # -# for commentry and a ; for parts of the config file that you -# may wish to enable -# -# NOTE: Whenever you modify this file you should run the command "testparm" -# to check that you have not made any basic syntactic errors. -# -#======================= Global Settings ===================================== -[global] - -# workgroup = NT-Domain-Name or Workgroup-Name, eg: MIDEARTH - workgroup = MYGROUP - -# server string is the equivalent of the NT Description field - server string = Samba Server - -# Security mode. Defines in which mode Samba will operate. Possible -# values are share, user, server, domain and ads. Most people will want -# user level security. See the Samba-HOWTO-Collection for details. - security = user - -# This option is important for security. It allows you to restrict -# connections to machines which are on your local network. The -# following example restricts access to two C class networks and -# the "loopback" interface. For more examples of the syntax see -# the smb.conf man page -; hosts allow = 192.168.1. 192.168.2. 127. - -# If you want to automatically load your printer list rather -# than setting them up individually then you'll need this - load printers = yes - -# you may wish to override the location of the printcap file -; printcap name = /etc/printcap - -# on SystemV system setting printcap name to lpstat should allow -# you to automatically obtain a printer list from the SystemV spool -# system -; printcap name = lpstat - -# It should not be necessary to specify the print system type unless -# it is non-standard. Currently supported print systems include: -# bsd, cups, sysv, plp, lprng, aix, hpux, qnx -; printing = cups - -# Uncomment this if you want a guest account, you must add this to /etc/passwd -# otherwise the user "nobody" is used -; guest account = pcguest - -# this tells Samba to use a separate log file for each machine -# that connects - log file = %%SAMBA_LOGDIR%%/log.%m - -# Put a capping on the size of the log files (in Kb). - max log size = 50 - -# Use password server option only with security = server -# The argument list may include: -# password server = My_PDC_Name [My_BDC_Name] [My_Next_BDC_Name] -# or to auto-locate the domain controller/s -# password server = * -; password server = - -# Use the realm option only with security = ads -# Specifies the Active Directory realm the host is part of -; realm = MY_REALM - -# Backend to store user information in. New installations should -# use either tdbsam or ldapsam. smbpasswd is available for backwards -# compatibility. tdbsam requires no further configuration. -; passdb backend = tdbsam - -# Using the following line enables you to customise your configuration -# on a per machine basis. The %m gets replaced with the netbios name -# of the machine that is connecting. -# Note: Consider carefully the location in the configuration file of -# this line. The included file is read at that point. -; include = %%SAMBA_CONFDIR%%/smb.conf.%m - -# Most people will find that this option gives better performance. -# See the chapter 'Samba performance issues' in the Samba HOWTO Collection -# and the manual pages for details. -# You may want to add the following on a Linux system: -# SO_RCVBUF=8192 SO_SNDBUF=8192 - socket options = TCP_NODELAY - -# Configure Samba to use multiple interfaces -# If you have multiple network interfaces then you must list them -# here. See the man page for details. -; interfaces = 192.168.12.2/24 192.168.13.2/24 - -# Browser Control Options: -# set local master to no if you don't want Samba to become a master -# browser on your network. Otherwise the normal election rules apply -; local master = no - -# OS Level determines the precedence of this server in master browser -# elections. The default value should be reasonable -; os level = 33 - -# Domain Master specifies Samba to be the Domain Master Browser. This -# allows Samba to collate browse lists between subnets. Don't use this -# if you already have a Windows NT domain controller doing this job -; domain master = yes - -# Preferred Master causes Samba to force a local browser election on startup -# and gives it a slightly higher chance of winning the election -; preferred master = yes - -# Enable this if you want Samba to be a domain logon server for -# Windows95 workstations. -; domain logons = yes - -# if you enable domain logons then you may want a per-machine or -# per user logon script -# run a specific logon batch file per workstation (machine) -; logon script = %m.bat -# run a specific logon batch file per username -; logon script = %U.bat - -# Where to store roving profiles (only for Win95 and WinNT) -# %L substitutes for this servers netbios name, %U is username -# You must uncomment the [Profiles] share below -; logon path = \\%L\Profiles\%U - -# Windows Internet Name Serving Support Section: -# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server -; wins support = yes - -# WINS Server - Tells the NMBD components of Samba to be a WINS Client -# Note: Samba can be either a WINS Server, or a WINS Client, but NOT both -; wins server = w.x.y.z - -# WINS Proxy - Tells Samba to answer name resolution queries on -# behalf of a non WINS capable client, for this to work there must be -# at least one WINS Server on the network. The default is NO. -; wins proxy = yes - -# DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names -# via DNS nslookups. The default is NO. - dns proxy = no - -# Charset settings -; display charset = koi8-r -; unix charset = koi8-r -; dos charset = cp866 - -# Use extended attributes to store file modes -; store dos attributes = yes -; map hidden = no -; map system = no -; map archive = no - -# Use inherited ACLs for directories -; nt acl support = yes -; inherit acls = yes -; map acl inherit = yes - -# These scripts are used on a domain controller or stand-alone -# machine to add or delete corresponding unix accounts -; add user script = /usr/sbin/useradd %u -; add group script = /usr/sbin/groupadd %g -; add machine script = /usr/sbin/adduser -n -g machines -c Machine -d /dev/null -s /bin/false %u -; delete user script = /usr/sbin/userdel %u -; delete user from group script = /usr/sbin/deluser %u %g -; delete group script = /usr/sbin/groupdel %g - - -#============================ Share Definitions ============================== -[homes] - comment = Home Directories - browseable = no - writable = yes - -# Un-comment the following and create the netlogon directory for Domain Logons -; [netlogon] -; comment = Network Logon Service -; path = /usr/local/samba/lib/netlogon -; guest ok = yes -; writable = no -; share modes = no - - -# Un-comment the following to provide a specific roving profile share -# the default is to use the user's home directory -;[Profiles] -; path = /usr/local/samba/profiles -; browseable = no -; guest ok = yes - - -# NOTE: If you have a BSD-style print system there is no need to -# specifically define each individual printer -[printers] - comment = All Printers - path = %%SAMBA_SPOOL%% - browseable = no -# Set public = yes to allow user 'guest account' to print - guest ok = no - writable = no - printable = yes - -# This one is useful for people to share files -;[tmp] -; comment = Temporary file space -; path = /tmp -; read only = no -; public = yes - -# A publicly accessible directory, but read only, except for people in -# the "staff" group -;[public] -; comment = Public Stuff -; path = /home/samba -; public = yes -; writable = yes -; printable = no -; write list = @staff - -# Other examples. -# -# A private printer, usable only by fred. Spool data will be placed in fred's -# home directory. Note that fred must have write access to the spool directory, -# wherever it is. -;[fredsprn] -; comment = Fred's Printer -; valid users = fred -; path = /homes/fred -; printer = freds_printer -; public = no -; writable = no -; printable = yes - -# A private directory, usable only by fred. Note that fred requires write -# access to the directory. -;[fredsdir] -; comment = Fred's Service -; path = /usr/somewhere/private -; valid users = fred -; public = no -; writable = yes -; printable = no - -# a service which has a different directory for each machine that connects -# this allows you to tailor configurations to incoming machines. You could -# also use the %U option to tailor it by user name. -# The %m gets replaced with the machine name that is connecting. -;[pchome] -; comment = PC Directories -; path = /usr/pc/%m -; public = no -; writable = yes - -# A publicly accessible directory, read/write to all users. Note that all files -# created in the directory by users will be owned by the default user, so -# any user with access can delete any other user's files. Obviously this -# directory must be writable by the default user. Another user could of course -# be specified, in which case all files would be owned by that user instead. -;[public] -; path = /usr/somewhere/else/public -; public = yes -; only guest = yes -; writable = yes -; printable = no - -# The following two entries demonstrate how to share a directory so that two -# users can place files there that will be owned by the specific users. In this -# setup, the directory should be writable by both users and should have the -# sticky bit set on it to prevent abuse. Obviously this could be extended to -# as many users as required. -;[myshare] -; comment = Mary's and Fred's stuff -; path = /usr/somewhere/shared -; valid users = mary fred -; public = no -; writable = yes -; printable = no -; create mask = 0765 - - Index: files/smb.conf.sample.in =================================================================== RCS file: files/smb.conf.sample.in diff -N files/smb.conf.sample.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/smb.conf.sample.in 11 Jul 2006 00:39:12 -0000 @@ -0,0 +1,294 @@ +# This is the main Samba configuration file. You should read the +# smb.conf(5) manual page in order to understand the options listed +# here. Samba has a huge number of configurable options (perhaps too +# many!) most of which are not shown in this example +# +# For a step to step guide on installing, configuring and using samba, +# read the Samba-HOWTO-Collection. This may be obtained from: +# http://www.samba.org/samba/docs/Samba-HOWTO-Collection.pdf +# +# Many working examples of smb.conf files can be found in the +# Samba-Guide which is generated daily and can be downloaded from: +# http://www.samba.org/samba/docs/Samba-Guide.pdf +# +# Any line which starts with a ; (semi-colon) or a # (hash) +# is a comment and is ignored. In this example we will use a # +# for commentry and a ; for parts of the config file that you +# may wish to enable +# +# NOTE: Whenever you modify this file you should run the command "testparm" +# to check that you have not made any basic syntactic errors. +# +#======================= Global Settings ===================================== +[global] + +# workgroup = NT-Domain-Name or Workgroup-Name, eg: MIDEARTH + workgroup = MYGROUP + +# server string is the equivalent of the NT Description field + server string = Samba Server + +# Security mode. Defines in which mode Samba will operate. Possible +# values are share, user, server, domain and ads. Most people will want +# user level security. See the Samba-HOWTO-Collection for details. + security = user + +# This option is important for security. It allows you to restrict +# connections to machines which are on your local network. The +# following example restricts access to two C class networks and +# the "loopback" interface. For more examples of the syntax see +# the smb.conf man page +; hosts allow = 192.168.1. 192.168.2. 127. + +# If you want to automatically load your printer list rather +# than setting them up individually then you'll need this + load printers = yes + +# you may wish to override the location of the printcap file +; printcap name = /etc/printcap + +# on SystemV system setting printcap name to lpstat should allow +# you to automatically obtain a printer list from the SystemV spool +# system +; printcap name = lpstat + +# It should not be necessary to specify the print system type unless +# it is non-standard. Currently supported print systems include: +# bsd, cups, sysv, plp, lprng, aix, hpux, qnx +; printing = cups + +# Uncomment this if you want a guest account, you must add this to /etc/passwd +# otherwise the user "nobody" is used +; guest account = pcguest + +# this tells Samba to use a separate log file for each machine +# that connects + log file = %%SAMBA_LOGDIR%%/log.%m + +# Put a capping on the size of the log files (in Kb). + max log size = 50 + +# Use password server option only with security = server +# The argument list may include: +# password server = My_PDC_Name [My_BDC_Name] [My_Next_BDC_Name] +# or to auto-locate the domain controller/s +# password server = * +; password server = + +# Use the realm option only with security = ads +# Specifies the Active Directory realm the host is part of +; realm = MY_REALM + +# Backend to store user information in. New installations should +# use either tdbsam or ldapsam. smbpasswd is available for backwards +# compatibility. tdbsam requires no further configuration. +; passdb backend = tdbsam + +# Using the following line enables you to customise your configuration +# on a per machine basis. The %m gets replaced with the netbios name +# of the machine that is connecting. +# Note: Consider carefully the location in the configuration file of +# this line. The included file is read at that point. +; include = %%SAMBA_CONFDIR%%/smb.conf.%m + +# Most people will find that this option gives better performance. +# See the chapter 'Samba performance issues' in the Samba HOWTO Collection +# and the manual pages for details. +# You may want to add the following on a Linux system: +# SO_RCVBUF=8192 SO_SNDBUF=8192 +; socket options = TCP_NODELAY + +# Configure Samba to use multiple interfaces +# If you have multiple network interfaces then you must list them +# here. See the man page for details. +; interfaces = 192.168.12.2/24 192.168.13.2/24 + +# Browser Control Options: +# set local master to no if you don't want Samba to become a master +# browser on your network. Otherwise the normal election rules apply +; local master = no + +# OS Level determines the precedence of this server in master browser +# elections. The default value should be reasonable +; os level = 33 + +# Domain Master specifies Samba to be the Domain Master Browser. This +# allows Samba to collate browse lists between subnets. Don't use this +# if you already have a Windows NT domain controller doing this job +; domain master = yes + +# Preferred Master causes Samba to force a local browser election on startup +# and gives it a slightly higher chance of winning the election +; preferred master = yes + +# Enable this if you want Samba to be a domain logon server for +# Windows95 workstations. +; domain logons = yes + +# if you enable domain logons then you may want a per-machine or +# per user logon script +# run a specific logon batch file per workstation (machine) +; logon script = %m.bat +# run a specific logon batch file per username +; logon script = %U.bat + +# Where to store roving profiles (only for Win95 and WinNT) +# %L substitutes for this servers netbios name, %U is username +# You must uncomment the [Profiles] share below +; logon path = \\%L\Profiles\%U + +# Windows Internet Name Serving Support Section: +# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server +; wins support = yes + +# WINS Server - Tells the NMBD components of Samba to be a WINS Client +# Note: Samba can be either a WINS Server, or a WINS Client, but NOT both +; wins server = w.x.y.z + +# WINS Proxy - Tells Samba to answer name resolution queries on +# behalf of a non WINS capable client, for this to work there must be +# at least one WINS Server on the network. The default is NO. +; wins proxy = yes + +# DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names +# via DNS nslookups. The default is NO. + dns proxy = no + +# Charset settings +; display charset = koi8-r +; unix charset = koi8-r +; dos charset = cp866 + +# Use extended attributes to store file modes +; store dos attributes = yes +; map hidden = no +; map system = no +; map archive = no + +# Use inherited ACLs for directories +; nt acl support = yes +; inherit acls = yes +; map acl inherit = yes + +# These scripts are used on a domain controller or stand-alone +# machine to add or delete corresponding unix accounts +; add user script = /usr/sbin/useradd %u +; add group script = /usr/sbin/groupadd %g +; add machine script = /usr/sbin/adduser -n -g machines -c Machine -d /dev/null -s /bin/false %u +; delete user script = /usr/sbin/userdel %u +; delete user from group script = /usr/sbin/deluser %u %g +; delete group script = /usr/sbin/groupdel %g + + +#============================ Share Definitions ============================== +[homes] + comment = Home Directories + browseable = no + writable = yes + +# Un-comment the following and create the netlogon directory for Domain Logons +; [netlogon] +; comment = Network Logon Service +; path = /usr/local/samba/lib/netlogon +; guest ok = yes +; writable = no +; share modes = no + + +# Un-comment the following to provide a specific roving profile share +# the default is to use the user's home directory +;[Profiles] +; path = /usr/local/samba/profiles +; browseable = no +; guest ok = yes + + +# NOTE: If you have a BSD-style print system there is no need to +# specifically define each individual printer +[printers] + comment = All Printers + path = %%SAMBA_SPOOL%% + browseable = no +# Set public = yes to allow user 'guest account' to print + guest ok = no + writable = no + printable = yes + +# This one is useful for people to share files +;[tmp] +; comment = Temporary file space +; path = /tmp +; read only = no +; public = yes + +# A publicly accessible directory, but read only, except for people in +# the "staff" group +;[public] +; comment = Public Stuff +; path = /home/samba +; public = yes +; writable = yes +; printable = no +; write list = @staff + +# Other examples. +# +# A private printer, usable only by fred. Spool data will be placed in fred's +# home directory. Note that fred must have write access to the spool directory, +# wherever it is. +;[fredsprn] +; comment = Fred's Printer +; valid users = fred +; path = /homes/fred +; printer = freds_printer +; public = no +; writable = no +; printable = yes + +# A private directory, usable only by fred. Note that fred requires write +# access to the directory. +;[fredsdir] +; comment = Fred's Service +; path = /usr/somewhere/private +; valid users = fred +; public = no +; writable = yes +; printable = no + +# a service which has a different directory for each machine that connects +# this allows you to tailor configurations to incoming machines. You could +# also use the %U option to tailor it by user name. +# The %m gets replaced with the machine name that is connecting. +;[pchome] +; comment = PC Directories +; path = /usr/pc/%m +; public = no +; writable = yes + +# A publicly accessible directory, read/write to all users. Note that all files +# created in the directory by users will be owned by the default user, so +# any user with access can delete any other user's files. Obviously this +# directory must be writable by the default user. Another user could of course +# be specified, in which case all files would be owned by that user instead. +;[public] +; path = /usr/somewhere/else/public +; public = yes +; only guest = yes +; writable = yes +; printable = no + +# The following two entries demonstrate how to share a directory so that two +# users can place files there that will be owned by the specific users. In this +# setup, the directory should be writable by both users and should have the +# sticky bit set on it to prevent abuse. Obviously this could be extended to +# as many users as required. +;[myshare] +; comment = Mary's and Fred's stuff +; path = /usr/somewhere/shared +; valid users = mary fred +; public = no +; writable = yes +; printable = no +; create mask = 0765 + + --- samba3.diff ends here --- >Release-Note: >Audit-Trail: Responsible-Changed-From-To: freebsd-ports-bugs->kuriyama Responsible-Changed-By: kuriyama Responsible-Changed-When: Wed Jul 12 00:09:17 UTC 2006 Responsible-Changed-Why: Take. http://www.freebsd.org/cgi/query-pr.cgi?pr=100100 State-Changed-From-To: open->closed State-Changed-By: kuriyama State-Changed-When: Wed Jul 12 00:36:37 UTC 2006 State-Changed-Why: Committed, thanks! http://www.freebsd.org/cgi/query-pr.cgi?pr=100100 >Unformatted: