gmane.os.pcbsd.scm http://blog.gmane.org/gmane.os.pcbsd.scm hourly 1 1901-01-01T00:00+00:00 Gmane http://gmane.org/img/gmane-25t.png http://gmane.org [PC-BSD Commits] r17791 - pcbsd-projects/AD_4_PCBSD/samba http://comments.gmane.org/gmane.os.pcbsd.scm/17342 <pre>Author: johnh Date: 2012-07-17 04:47:49 +0000 (Tue, 17 Jul 2012) New Revision: 17791 Modified: pcbsd-projects/AD_4_PCBSD/samba/sambaconf.c Log: bugfix, was setting node and continuing even after the proper section was found. Modified: pcbsd-projects/AD_4_PCBSD/samba/sambaconf.c =================================================================== --- pcbsd-projects/AD_4_PCBSD/samba/sambaconf.c2012-07-17 04:22:02 UTC (rev 17790) +++ pcbsd-projects/AD_4_PCBSD/samba/sambaconf.c2012-07-17 04:47:49 UTC (rev 17791) &lt; at &gt;&lt; at &gt; -225,8 +225,9 &lt; at &gt;&lt; at &gt; section = 1; } +node = se; if (section != 0) -node = se; +break; } if (sm-&gt;overwrite) { </pre> svn-E1R8x85rdljYtjvyW6yDsg< at >public.gmane.org 2012-07-17T04:47:49 [PC-BSD Commits] r17792 - pcbsd-projects/AD_4_PCBSD/scripts http://comments.gmane.org/gmane.os.pcbsd.scm/17341 <pre>Author: johnh Date: 2012-07-17 04:58:17 +0000 (Tue, 17 Jul 2012) New Revision: 17792 Modified: pcbsd-projects/AD_4_PCBSD/scripts/pc-adctl pcbsd-projects/AD_4_PCBSD/scripts/pc-kinit pcbsd-projects/AD_4_PCBSD/scripts/pc-nsswitch pcbsd-projects/AD_4_PCBSD/scripts/pc-samba Log: Modified scripts to make AD work. Modified: pcbsd-projects/AD_4_PCBSD/scripts/pc-adctl =================================================================== --- pcbsd-projects/AD_4_PCBSD/scripts/pc-adctl2012-07-17 04:47:49 UTC (rev 17791) +++ pcbsd-projects/AD_4_PCBSD/scripts/pc-adctl2012-07-17 04:58:17 UTC (rev 17792) &lt; at &gt;&lt; at &gt; -7,7 +7,7 &lt; at &gt;&lt; at &gt; . /usr/local/etc/rc.AD -ad_assert() +adctl_assert() { local args="$*" &lt; at &gt;&lt; at &gt; -19,36 +19,67 &lt; at &gt;&lt; at &gt; fi } -ad_start() +adctl_start() { if checkyesno activedirectory_enable 2&gt;/dev/null then -ad_assert service pc-kerberos start -ad_assert service pc-nsswitch start -ad_assert service pc-pam start -#service pc-samba start -#service pc-kinit start -#service pc-kinit status -#service pc-activedirectory start -#service pc-activedirectory status +adctl_assert service pc-kerberos start +adctl_assert service pc-nsswitch start +adctl_assert service pc-pam start + +service samba status +if [ "$?" = "0" ] +then +adctl_assert service samba stop +adctl_assert service pc-samba start +adctl_assert service samba start +else +adctl_assert service pc-samba start +adctl_assert service samba start +fi + +adctl_assert service pc-kinit start +adctl_assert service pc-kinit status +adctl_assert service pc-activedirectory start +adctl_assert service pc-activedirectory status fi return 0 } -ad_status() +adctl_status() { +service pc-activedirectory status +return $? } -ad_stop() +adctl_stop() { +if checkyesno activedirectory_enable 2&gt;/dev/null +then +service pc-kerberos stop +service pc-nsswitch stop +service pc-pam stop +service pc-samba stop +service pc-kinit stop +service pc-activedirectory stop + +service samba status +if [ "$?" = "0" ] +then +adctl_assert service samba stop +adctl_assert service samba start +else +adctl_assert service samba start +fi +fi } name="pc-adctl" -start_cmd='ad_start' -status_cmd='ad_status' -stop_cmd='ad_stop' +start_cmd='adctl_start' +status_cmd='adctl_status' +stop_cmd='adctl_stop' load_rc_config $name run_rc_command "$1" Modified: pcbsd-projects/AD_4_PCBSD/scripts/pc-kinit =================================================================== --- pcbsd-projects/AD_4_PCBSD/scripts/pc-kinit2012-07-17 04:47:49 UTC (rev 17791) +++ pcbsd-projects/AD_4_PCBSD/scripts/pc-kinit2012-07-17 04:58:17 UTC (rev 17792) &lt; at &gt;&lt; at &gt; -16,7 +16,6 &lt; at &gt;&lt; at &gt; local ec pwfile ec=1 - if checkyesno activedirectory_enable 2&gt;/dev/null then AD_init &lt; at &gt;&lt; at &gt; -38,15 +37,14 &lt; at &gt;&lt; at &gt; sleep 10 fi fi -return $ec + +return ${ec} } kerberos_status() { -local ec +local ec=1 -ec=1 - if checkyesno activedirectory_enable 2&gt;/dev/null then AD_init &lt; at &gt;&lt; at &gt; -62,7 +60,8 &lt; at &gt;&lt; at &gt; ec=$? fi fi -return $ec + +return ${ec} } kerberos_stop() Modified: pcbsd-projects/AD_4_PCBSD/scripts/pc-nsswitch =================================================================== --- pcbsd-projects/AD_4_PCBSD/scripts/pc-nsswitch2012-07-17 04:47:49 UTC (rev 17791) +++ pcbsd-projects/AD_4_PCBSD/scripts/pc-nsswitch2012-07-17 04:58:17 UTC (rev 17792) &lt; at &gt;&lt; at &gt; -26,7 +26,7 &lt; at &gt;&lt; at &gt; if [ "$?" = "0" -a -s "${tmp}" ] then mv "${tmp}" "${PATH_NS_CONF}" -return 0 +return $? fi return 1 &lt; at &gt;&lt; at &gt; -49,7 +49,7 &lt; at &gt;&lt; at &gt; if [ "$?" = "0" -a -s "${tmp}" ] then mv "${tmp}" "${PATH_NS_CONF}" -return 0 +return $? fi return 1 Modified: pcbsd-projects/AD_4_PCBSD/scripts/pc-samba =================================================================== --- pcbsd-projects/AD_4_PCBSD/scripts/pc-samba2012-07-17 04:47:49 UTC (rev 17791) +++ pcbsd-projects/AD_4_PCBSD/scripts/pc-samba2012-07-17 04:58:17 UTC (rev 17792) &lt; at &gt;&lt; at &gt; -14,12 +14,14 &lt; at &gt;&lt; at &gt; : ${SAMBACONF:="/usr/local/bin/sambaconf"} -generate_smbconf() +ad_smbconf_start() { if checkyesno activedirectory_enable 2&gt;/dev/null then +local tmp=$(mktemp /tmp/samba.XXXXXX) + AD_init - +cp "${SMB_CONF}" "${SMB_CONF}.orig" ${SAMBACONF} -f ${SMB_CONF} \ -w -m "+global:security=ADS" \ -w -m "+global:realm=$(AD_get domainname | tr a-z A-Z)" \ &lt; at &gt;&lt; at &gt; -49,13 +51,35 &lt; at &gt;&lt; at &gt; -w -m "+global:winbind refresh tickets=yes" \ -w -m "+global:allow trusted domains=yes" \ -w -m "+global:template shell=/bin/sh" \ --w -m "+global: template homedir=/home/%U" +-w -m "+global: template homedir=/home/%U" \ +-o "${tmp}" + +if [ "$?" = "0" -a -s "${tmp}" ] +then +mv "${tmp}" "${SMB_CONF}" +return $? +fi + +return 1 fi + +return 0 } +ad_smbconf_stop() +{ +if checkyesno activedirectory_enable 2&gt;/dev/null +then +cp "${SMB_CONF}.orig" "${SMB_CONF}" +return $? +fi + +return 0 +} + name="pc-samba" -start_cmd='generate_smbconf' -stop_cmd=':' +start_cmd='ad_smbconf_start' +stop_cmd='ad_smbconf_stop' load_rc_config $name run_rc_command "$1" </pre> svn-E1R8x85rdljYtjvyW6yDsg< at >public.gmane.org 2012-07-17T04:58:17 [PC-BSD Commits] r17793 - pcbsd-projects/AD_4_PCBSD/rc http://comments.gmane.org/gmane.os.pcbsd.scm/17340 <pre>Author: johnh Date: 2012-07-17 05:03:24 +0000 (Tue, 17 Jul 2012) New Revision: 17793 Modified: pcbsd-projects/AD_4_PCBSD/rc/rc.AD Log: Remove FreeNAS specific code/settings. Modified: pcbsd-projects/AD_4_PCBSD/rc/rc.AD =================================================================== --- pcbsd-projects/AD_4_PCBSD/rc/rc.AD2012-07-17 04:58:17 UTC (rev 17792) +++ pcbsd-projects/AD_4_PCBSD/rc/rc.AD2012-07-17 05:03:24 UTC (rev 17793) &lt; at &gt;&lt; at &gt; -26,87 +26,7 &lt; at &gt;&lt; at &gt; . /etc/rc.subr - # -#FreeNAS settings -# -: ${FREENAS_CONFIG:="/data/freenas-v1.db"} -: ${FREENAS_CONFIG_MD5:="/var/tmp/freenas_config.md5"} -: ${FREENAS_SQLITE_CMD:="/usr/local/bin/sqlite3"} -: ${FREENAS_RC:="/var/tmp/rc.conf.freenas"} - -# -#Updater specific variables. -# -: ${CD_UPGRADE_SENTINEL="/data/cd-upgrade"} -: ${NEED_UPDATE_SENTINEL="/data/need-update"} - -# -#OPENSSL settings -# -: ${OPENSSL:="/usr/bin/openssl"} -: ${SSLDIR:="/etc/ssl/freenas"} -: ${SSLCONF:="${SSLDIR}/openssl.conf"} -: ${SSLCADIR:="${SSLDIR}/CA"} -: ${SSLCACERTDIR:="${SSLCADIR}/certs"} -: ${SSLCAPRIVDIR:="${SSLCADIR}/private"} -: ${SSLCACERT:="${SSLCADIR}/cacert.crt"} -: ${SSLCAKEY:="${SSLCAPRIVDIR}/cakey.key"} - -# -#HTTPD settings -# -: ${HTTPD:="/usr/local/sbin/nginx"} -: ${HTTPDDIR:="/usr/local/etc/nginx"} -: ${HTTPDSCRIPT:="/usr/local/etc/rc.d/nginx"} -: ${HTTPDCONF:="${HTTPDDIR}/nginx.conf"} -: ${HTTPDSSLDIR:="${SSLDIR}/nginx"} -: ${HTTPDKEY:="${HTTPDSSLDIR}/nginx.key"} -: ${HTTPDCERT:="${HTTPDSSLDIR}/nginx.crt"} -: ${HTTPDSSLPORT:="443"} -: ${HTTPDPORT:="80"} - -# -#Misc settings -# -: ${FREENAS_CACHEDIR:="/var/tmp/.cache"} -: ${FREENAS_CACHESIZE:="2g"} -: ${FREENAS_CACHEEXPIRE:="60"} - -# -#LDAP settings -# -: ${NSS_LDAP_CONF:="/usr/local/etc/nss_ldap.conf"} -: ${NSS_LDAP_SECRET:="/usr/local/etc/nss_ldap.secret"} -: ${LDAP_CONF:="/usr/local/etc/openldap/ldap.conf"} -: ${CERT_FILE:="/usr/local/etc/certs/cacert.crt"} -: ${LDAP_TIMEOUT:="0"} - -# -#PAM settings -# -: ${PAM_TEMPLATE_DIR:="/etc/ix/templates/pam.d"} -: ${PAM_DIR:="/etc/pam.d"} - -# -#NSS settings -# -: ${PATH_NS_CONF:="/etc/nsswitch.conf"} - -# -#Kerberos settings -# -: ${PATH_KRB5_TEMPLATE:="/etc/ix/templates/kerberos/krb5.conf"} -: ${PATH_KRB5_CONFIG:="/etc/krb5.conf"} -: ${PATH_AD_KEYTAB:="/etc/AD.keytab"} - -# -#Samba settings -# -: ${SMB_CONF:="/usr/local/etc/smb.conf"} - - -# #Active Directory config # : ${AD_CONF:="/usr/local/etc/AD.conf"} &lt; at &gt;&lt; at &gt; -449,85 +369,3 &lt; at &gt;&lt; at &gt; AD_set gchost "$(echo "${gc}"|cut -f1 -d:)" AD_set gcport "$(echo "${gc}"|cut -f2 -d:)" } - -# Create a cache filesystem on ${FREENAS_CACHEDIR} . -# -# Used by ix-activedirectory and ix-ldap. -# -# Returns 0 if successful; 1 if unsuccessful. -# -# NOTE: This function is intentionally noisy to catch potential logic errors -# with the boot process. -# -# TODO: add permanent store capability; using the mdconfig* rc.d scripts would -# be a good idea as it features pre-populating / fsck functionality for memory -# disk images, whereas mdmfs doesn't. -# TODO: employ something similar for ix-collectd, but only after the permanent -# store capability has been added. -create_cache_filesystem() -{ -local dev - -# test to see if /var is an md, if not, presumably it's been moved to -# a persistant volume, so skip creating a separate in memory -# filesystem for it. -mount | awk '$3 == "/var" {print $1}' | grep -qE "/dev/md[[:digit:]]+" -if [ $? -ne 0 ] ; then -if [ ! -d "${FREENAS_CACHEDIR}" ]; then -mkdir -p "${FREENAS_CACHEDIR}" -fi -return 0 -fi - -if [ -d "${FREENAS_CACHEDIR}" ]; then -dev=$(mount | awk -v "dir=$FREENAS_CACHEDIR" \ -'$3 == dir { print $1 }') -if [ -n "$dev" ] &amp;&amp; ! umount $dev; then -return 1 -fi -else -mkdir -p "${FREENAS_CACHEDIR}" -fi - -mdmfs -i 4096 -b 4096 -f 512 -s ${FREENAS_CACHESIZE} \ - md "${FREENAS_CACHEDIR}" -if [ $? -eq 0 ]; then -return 0 -fi - -return 1 -} - -# -#General purpose utility functions. -# - -# 'var to SQL Fields' -# -# sh vars don't work with ',', but SQL fields require use them as required separators. -var_to_sf() -{ -echo $* | sed -e 's/ /, /g' -} - -# Is a service enabled? -# -# Parameters: -# 1 - service name, e.g. afp, cifs, etc. -# -# Returns: -# 0 - enabled -# 1 - disabled -# 2 - not found -srv_enabled() -{ -enabled=$(${FREENAS_SQLITE_CMD} ${FREENAS_CONFIG} \ - "SELECT srv_enable from services_services where srv_service = '$1'" \ - 2&gt;/dev/null) -if [ "$enabled" = 1 ]; then -return 0 -elif [ "$enabled" = 0 ]; then -return 1 -fi -return 2 -} </pre> svn-E1R8x85rdljYtjvyW6yDsg< at >public.gmane.org 2012-07-17T05:03:24 [PC-BSD Commits] r17790 - pcbsd-projects/AD_4_PCBSD/pam http://comments.gmane.org/gmane.os.pcbsd.scm/17339 <pre>Author: johnh Date: 2012-07-17 04:22:02 +0000 (Tue, 17 Jul 2012) New Revision: 17790 Modified: pcbsd-projects/AD_4_PCBSD/pam/pam-lexer.l Log: Left out another needed symbol Modified: pcbsd-projects/AD_4_PCBSD/pam/pam-lexer.l =================================================================== --- pcbsd-projects/AD_4_PCBSD/pam/pam-lexer.l2012-07-17 03:58:18 UTC (rev 17789) +++ pcbsd-projects/AD_4_PCBSD/pam/pam-lexer.l2012-07-17 04:22:02 UTC (rev 17790) &lt; at &gt;&lt; at &gt; -31,7 +31,7 &lt; at &gt;&lt; at &gt; optional{ return (OPTIONAL); } include{ return (INCLUDE); } -[a-zA-Z0-9_\-\./]+{ yylval.str = xstrdup(yytext); return (STRING); } +[a-zA-Z0-9_\-\./=]+{ yylval.str = xstrdup(yytext); return (STRING); } [ \t]+ %% </pre> svn-E1R8x85rdljYtjvyW6yDsg< at >public.gmane.org 2012-07-17T04:22:02 [PC-BSD Commits] r17789 - pcbsd-projects/AD_4_PCBSD/scripts http://comments.gmane.org/gmane.os.pcbsd.scm/17338 <pre>Author: johnh Date: 2012-07-17 03:58:18 +0000 (Tue, 17 Jul 2012) New Revision: 17789 Modified: pcbsd-projects/AD_4_PCBSD/scripts/pc-adctl pcbsd-projects/AD_4_PCBSD/scripts/pc-nsswitch pcbsd-projects/AD_4_PCBSD/scripts/pc-pam Log: Make PAM and NSS work. Modified: pcbsd-projects/AD_4_PCBSD/scripts/pc-adctl =================================================================== --- pcbsd-projects/AD_4_PCBSD/scripts/pc-adctl2012-07-17 03:44:47 UTC (rev 17788) +++ pcbsd-projects/AD_4_PCBSD/scripts/pc-adctl2012-07-17 03:58:18 UTC (rev 17789) &lt; at &gt;&lt; at &gt; -25,7 +25,7 &lt; at &gt;&lt; at &gt; then ad_assert service pc-kerberos start ad_assert service pc-nsswitch start -#service pc-pam start +ad_assert service pc-pam start #service pc-samba start #service pc-kinit start #service pc-kinit status Modified: pcbsd-projects/AD_4_PCBSD/scripts/pc-nsswitch =================================================================== --- pcbsd-projects/AD_4_PCBSD/scripts/pc-nsswitch2012-07-17 03:44:47 UTC (rev 17788) +++ pcbsd-projects/AD_4_PCBSD/scripts/pc-nsswitch2012-07-17 03:58:18 UTC (rev 17789) &lt; at &gt;&lt; at &gt; -12,7 +12,7 &lt; at &gt;&lt; at &gt; : ${PATH_NS_CONF:="/etc/nsswitch.conf"} : ${NSSCONF:="/usr/local/bin/nssconf"} -nsswitch_conf_start() +ad_nsswitch_conf_start() { if checkyesno activedirectory_enable 2&gt;/dev/null then &lt; at &gt;&lt; at &gt; -35,7 +35,7 &lt; at &gt;&lt; at &gt; return 0 } -nsswitch_conf_stop() +ad_nsswitch_conf_stop() { if checkyesno activedirectory_enable 2&gt;/dev/null then &lt; at &gt;&lt; at &gt; -59,8 +59,8 &lt; at &gt;&lt; at &gt; } name="pc-nsswitch" -start_cmd='nsswitch_conf_start' -stop_cmd='nsswitch_conf_stop' +start_cmd='ad_nsswitch_conf_start' +stop_cmd='ad_nsswitch_conf_stop' load_rc_config $name run_rc_command "$1" Modified: pcbsd-projects/AD_4_PCBSD/scripts/pc-pam =================================================================== --- pcbsd-projects/AD_4_PCBSD/scripts/pc-pam2012-07-17 03:44:47 UTC (rev 17788) +++ pcbsd-projects/AD_4_PCBSD/scripts/pc-pam2012-07-17 03:58:18 UTC (rev 17789) &lt; at &gt;&lt; at &gt; -3,111 +3,148 &lt; at &gt;&lt; at &gt; # $FreeBSD$ # -# PROVIDE: ix-pam +# PROVIDE: pc-pam # REQUIRE: root -# REQUIRE: ix-nsswitch +# REQUIRE: pc-nsswitch # BEFORE: NETWORK -. /etc/rc.subr +. /usr/local/etc/rc.AD -: ${PAM_TEMPLATE_DIR:="/etc/ix/templates/pam.d"} -: ${PAM_DIR:="/etc/pam.d"} +: ${DEFAULT_PAM_SERVICES:="ftp login passwd sshd su telnetd"} +: ${PAMDIR:="/etc/pam.d"} +: ${PAMCONF:="/usr/local/bin/pamconf"} -generate_pam_service_file() +: ${active_directory_pam_services:="${DEFAULT_PAM_SERVICES}"} + +ad_pam_start() { -local service="${1}" -local winbind="${2}" -local ldap="${3}" -local template -local temp -local file +if checkyesno activedirectory_enable 2&gt;/dev/null +then +local tmpdir=$(mktemp -d /tmp/pam.XXXXXX) +local errors=0 -template="${PAM_TEMPLATE_DIR}/${service}" -temp="/tmp/.tmp.${service}" -file="${PAM_DIR}/${service}" +for s in ${active_directory_pam_services} +do +local tmp="${tmpdir}/${s}" +local sfile="${PAMDIR}/${s}" -if [ ! -f "${template}" ] -then -return 1 -fi +cp "${sfile}" "${tmpdir}/${s}.orig" +${PAMCONF} -f "${sfile}" \ +-m "+2auth:sufficient:/usr/local/lib/pam_winbind.so:silent:try_first_pass:krb5_auth:krb5_ccache_type=FILE" \ +-m "+2account:sufficient:/usr/local/lib/pam_winbind.so:krb5_auth:krb5_ccache_type=FILE" \ +-m "+session:required:/usr/local/lib/pam_mkhomedir.so" \ +-m "+0password:sufficient:/usr/local/lib/pam_winbind.so:try_first_pass:krb5_auth krb5_ccache_type=FILE" \ +-o "${tmp}" -awk -v ldap="${ldap}" -v winbind="${winbind}" '{ -if (/^#.*&lt; at &gt;&lt; at &gt;LDAP&lt; at &gt;&lt; at &gt;/ &amp;&amp; ldap) { -gsub("^#.*&lt; at &gt;&lt; at &gt;LDAP&lt; at &gt;&lt; at &gt;[^a-zA-Z0-9]+", ""); -print $0; -} else if (/^#.*&lt; at &gt;&lt; at &gt;WINBIND&lt; at &gt;&lt; at &gt;/ &amp;&amp; winbind) { -gsub("^#.*&lt; at &gt;&lt; at &gt;WINBIND&lt; at &gt;&lt; at &gt;[^a-zA-Z0-9]+", ""); -print $0; -} else if (/^#.*&lt; at &gt;&lt; at &gt;MKHOMEDIR&lt; at &gt;&lt; at &gt;/ &amp;&amp; (ldap || winbind)) { -gsub("^#.*&lt; at &gt;&lt; at &gt;MKHOMEDIR&lt; at &gt;&lt; at &gt;[^a-zA-Z0-9]+", ""); -print $0; -} else if (/^#.*&lt; at &gt;&lt; at &gt;.*&lt; at &gt;&lt; at &gt;/) { -} else { -print $0; -} -}' &lt; "${template}" &gt; "${temp}" +if [ "$?" != "0" -o ! -s "${tmp}" ] +then +errors=1 +break +fi +done -if [ -f "${temp}" ] -then -mv "${temp}" "${file}" &gt;/dev/null 2&gt;&amp;1 -if [ "$?" != "0" ] +if [ "${errors}" = "0" ] then -rm -f "${temp}" +for s in $(ls ${tmpdir}|grep -v '.orig') +do +local sfile="${PAMDIR}/${s}" + +mv "${tmpdir}/${s}" "${sfile}" +if [ "$?" != "0" ] +then +errors=1 +break +fi +done +fi + +if [ "${errors}" = "1" ] +then +for s in $(ls ${tmpdir}/*.orig) +do +local sfile="${PAMDIR}/$(echo ${s}|sed 's/.orig//')" +local orig="${tmpdir}/${s}" + +mv ${orig} ${sfile} +done + +rm -rf "${tmpdir}" &gt;/dev/null 2&gt;&amp;1 return 1 fi + +rm -rf "${tmpdir}" &gt;/dev/null 2&gt;&amp;1 +return 0 fi return 0 } - -generate_pam_files() +ad_pam_stop() { -local ldap=0 -local winbind=0 - -if [ ! -d "${PAM_TEMPLATE_DIR}" -o ! -d "${PAM_DIR}" ] +if checkyesno activedirectory_enable 2&gt;/dev/null then -return 1 -fi +local tmpdir=$(mktemp -d /tmp/pam.XXXXXX) +local errors=0 -while read line -do -local var=$(echo "${line}"|cut -s -f1 -d'|') -local val=$(echo "${line}"|cut -s -f2 -d'|') +for s in ${active_directory_pam_services} +do +local tmp="${tmpdir}/${s}" +local sfile="${PAMDIR}/${s}" -case "${var}" in -activedirectory) winbind="${val}" ;; -ldap) ldap="${val}" ;; -esac +cp "${sfile}" "${tmpdir}/${s}.orig" +${PAMCONF} -f "${sfile}" \ +-m '-auth:sufficient:/usr/local/lib/pam_winbind.so' \ +-m '-account:sufficient:/usr/local/lib/pam_winbind.so' \ +-m '-session:required:/usr/local/lib/pam_mkhomedir.so' \ +-m '-password:sufficient:/usr/local/lib/pam_winbind.so' \ +-o "${tmp}" -done &lt;&lt;EOF -$(${FREENAS_SQLITE_CMD} ${FREENAS_CONFIG} " -SELECT -srv_service, -srv_enable +if [ "$?" != "0" -o ! -s "${tmp}" ] +then +errors=1 +break +fi +done -FROM -services_services +if [ "${errors}" = "0" ] +then +for s in $(ls ${tmpdir}|grep -v '.orig') +do +local sfile="${PAMDIR}/${s}" -WHERE -srv_service IN ( -'ldap', -'activedirectory' -)") -EOF +mv "${tmpdir}/${s}" "${sfile}" +if [ "$?" != "0" ] +then +errors=1 +break +fi +done +fi -for service in $(ls "${PAM_TEMPLATE_DIR}") -do -generate_pam_service_file "${service}" "${winbind}" "${ldap}" -done +if [ "${errors}" = "1" ] +then +for s in $(ls ${tmpdir}/*.orig) +do +local sfile="${PAMDIR}/$(echo ${s}|sed 's/.orig//')" +local orig="${tmpdir}/${s}" +mv ${orig} ${sfile} +done + +rm -rf "${tmpdir}" &gt;/dev/null 2&gt;&amp;1 +return 1 +fi + +rm -rf "${tmpdir}" &gt;/dev/null 2&gt;&amp;1 +return 0 +fi + return 0 } -name="ix-pam" -start_cmd='generate_pam_files' -stop_cmd=':' +name="pc-pam" +start_cmd='ad_pam_start' +stop_cmd='ad_pam_stop' load_rc_config $name run_rc_command "$1" </pre> svn-E1R8x85rdljYtjvyW6yDsg< at >public.gmane.org 2012-07-17T03:58:18 [PC-BSD Commits] r17788 - pcbsd-projects/AD_4_PCBSD/pam http://comments.gmane.org/gmane.os.pcbsd.scm/17337 <pre>Author: johnh Date: 2012-07-17 03:44:47 +0000 (Tue, 17 Jul 2012) New Revision: 17788 Modified: pcbsd-projects/AD_4_PCBSD/pam/pam-lexer.l pcbsd-projects/AD_4_PCBSD/pam/pam-parser.y pcbsd-projects/AD_4_PCBSD/pam/pamconf.c pcbsd-projects/AD_4_PCBSD/pam/pamconf.h Log: Bug fixes. '/' was not being parsed properly. Some functions in the parser moved into the main C program and externed to the parser also. Modified: pcbsd-projects/AD_4_PCBSD/pam/pam-lexer.l =================================================================== --- pcbsd-projects/AD_4_PCBSD/pam/pam-lexer.l2012-07-16 21:47:49 UTC (rev 17787) +++ pcbsd-projects/AD_4_PCBSD/pam/pam-lexer.l2012-07-17 03:44:47 UTC (rev 17788) &lt; at &gt;&lt; at &gt; -18,7 +18,7 &lt; at &gt;&lt; at &gt; \n{ return (NEWLINE); } -^#(.+)?${ yylval.str = strdup(yytext); return (COMMENT); } +^#(.+)?${ yylval.str = xstrdup(yytext); return (COMMENT); } auth{ return (AUTH); } account{ return (ACCOUNT); } &lt; at &gt;&lt; at &gt; -31,7 +31,7 &lt; at &gt;&lt; at &gt; optional{ return (OPTIONAL); } include{ return (INCLUDE); } -[a-zA-Z0-9_\-\.]+{ yylval.str = strdup(yytext); return (STRING); } +[a-zA-Z0-9_\-\./]+{ yylval.str = xstrdup(yytext); return (STRING); } [ \t]+ %% Modified: pcbsd-projects/AD_4_PCBSD/pam/pam-parser.y =================================================================== --- pcbsd-projects/AD_4_PCBSD/pam/pam-parser.y2012-07-16 21:47:49 UTC (rev 17787) +++ pcbsd-projects/AD_4_PCBSD/pam/pam-parser.y2012-07-17 03:44:47 UTC (rev 17788) &lt; at &gt;&lt; at &gt; -17,10 +17,6 &lt; at &gt;&lt; at &gt; externstruct pam_entry *cur; externvoid add_argument(struct pam_entry *pe, const char *arg); -externstruct pam_entry *new_pam_entry(int facility); -externvoid free_arguments(struct pam_entry *pe); -externvoid free_pam_entry(struct pam_entry *pe); -externvoid free_pam_entries(struct pam_entry_list *pe_list); %} &lt; at &gt;&lt; at &gt; -210,101 +206,7 &lt; at &gt;&lt; at &gt; } } -struct pam_entry * -new_pam_entry(int facility) -{ -struct pam_entry *pe = xalloc(sizeof(*pe)); -pe-&gt;pes_arguments = NULL; -pe-&gt;pes_narguments = 0; -pe-&gt;facility = facility; -pe-&gt;type = PAM_ENTRY_NULL; -bzero(&amp;pe-&gt;pe, sizeof(pe-&gt;pe)); - -switch (facility) { -case AUTH: -TAILQ_INSERT_TAIL(&amp;p_config.pc_auth, pe, entries); -pe-&gt;index = p_config.pc_auth_nentries; -p_config.pc_auth_nentries++; -break; - -case ACCOUNT: -TAILQ_INSERT_TAIL(&amp;p_config.pc_account, pe, entries); -pe-&gt;index = p_config.pc_account_nentries; -p_config.pc_account_nentries++; -break; - -case SESSION: -TAILQ_INSERT_TAIL(&amp;p_config.pc_session, pe, entries); -pe-&gt;index = p_config.pc_session_nentries; -p_config.pc_session_nentries++; -break; - -case PASSWORD: -TAILQ_INSERT_TAIL(&amp;p_config.pc_password, pe, entries); -pe-&gt;index = p_config.pc_password_nentries; -p_config.pc_password_nentries++; -break; - -case COMMENT: -TAILQ_INSERT_TAIL(&amp;p_config.pc_comment, pe, entries); -pe-&gt;index = p_config.pc_comment_nentries; -p_config.pc_comment_nentries++; -break; -} - -return (pe); -} - void -free_arguments(struct pam_entry *pe) -{ -if (pe != NULL) { -int i; - -for (i = 0;i &lt; pe-&gt;pes_narguments;i++) { -if (pe-&gt;pes_arguments[i] != NULL) -free(pe-&gt;pes_arguments[i]); -pe-&gt;pes_arguments[i] = 0; -} - -free(pe-&gt;pes_arguments); -pe-&gt;pes_arguments = NULL; -pe-&gt;pes_narguments = 0; -} -} - -void -free_pam_entry(struct pam_entry *pe) -{ -switch (pe-&gt;type) { -case PAM_ENTRY_SERVICE: -free_arguments(pe); -free(pe-&gt;pes_module); -break; - -case PAM_ENTRY_INCLUDE: -free(pe-&gt;pei_service); -break; - -case PAM_ENTRY_COMMENT: -free(pe-&gt;pec_text); -break; -} - -free(pe); -} - -void -free_pam_entries(struct pam_entry_list *pe_list) -{ -while (!TAILQ_EMPTY(pe_list)) { -struct pam_entry *pe = TAILQ_FIRST(pe_list); -TAILQ_REMOVE(pe_list, pe, entries); -free_pam_entry(pe); -} -} - -void yyerror(const char *str) { fprintf(stderr, "%s:%d: error: %s\n", __FILE__, lineno, str); Modified: pcbsd-projects/AD_4_PCBSD/pam/pamconf.c =================================================================== --- pcbsd-projects/AD_4_PCBSD/pam/pamconf.c2012-07-16 21:47:49 UTC (rev 17787) +++ pcbsd-projects/AD_4_PCBSD/pam/pamconf.c2012-07-17 03:44:47 UTC (rev 17788) &lt; at &gt;&lt; at &gt; -72,6 +72,100 &lt; at &gt;&lt; at &gt; return (ptr); } +struct pam_entry * +new_pam_entry(int facility) +{ +struct pam_entry *pe = xalloc(sizeof(*pe)); +pe-&gt;pes_arguments = NULL; +pe-&gt;pes_narguments = 0; +pe-&gt;facility = facility; +pe-&gt;type = PAM_ENTRY_NULL; +bzero(&amp;pe-&gt;pe, sizeof(pe-&gt;pe)); + +switch (facility) { +case AUTH: +TAILQ_INSERT_TAIL(&amp;p_config.pc_auth, pe, entries); +pe-&gt;index = p_config.pc_auth_nentries; +p_config.pc_auth_nentries++; +break; + +case ACCOUNT: +TAILQ_INSERT_TAIL(&amp;p_config.pc_account, pe, entries); +pe-&gt;index = p_config.pc_account_nentries; +p_config.pc_account_nentries++; +break; + +case SESSION: +TAILQ_INSERT_TAIL(&amp;p_config.pc_session, pe, entries); +pe-&gt;index = p_config.pc_session_nentries; +p_config.pc_session_nentries++; +break; + +case PASSWORD: +TAILQ_INSERT_TAIL(&amp;p_config.pc_password, pe, entries); +pe-&gt;index = p_config.pc_password_nentries; +p_config.pc_password_nentries++; +break; + +case COMMENT: +TAILQ_INSERT_TAIL(&amp;p_config.pc_comment, pe, entries); +pe-&gt;index = p_config.pc_comment_nentries; +p_config.pc_comment_nentries++; +break; +} + +return (pe); +} + +void +free_arguments(struct pam_entry *pe) +{ +if (pe != NULL) { +int i; + +for (i = 0;i &lt; pe-&gt;pes_narguments;i++) { +if (pe-&gt;pes_arguments[i] != NULL) +xfree(&amp;pe-&gt;pes_arguments[i]); +pe-&gt;pes_arguments[i] = 0; +} + +xfree(&amp;pe-&gt;pes_arguments); +pe-&gt;pes_arguments = NULL; +pe-&gt;pes_narguments = 0; +} +} + +void +free_pam_entry(struct pam_entry *pe) +{ +switch (pe-&gt;type) { +case PAM_ENTRY_SERVICE: +free_arguments(pe); +xfree(&amp;pe-&gt;pes_module); +break; + +case PAM_ENTRY_INCLUDE: +xfree(&amp;pe-&gt;pei_service); +break; + +case PAM_ENTRY_COMMENT: +xfree(&amp;pe-&gt;pec_text); +break; +} + +free(pe); +} + +void +free_pam_entries(struct pam_entry_list *pe_list) +{ +while (!TAILQ_EMPTY(pe_list)) { +struct pam_entry *pe = TAILQ_FIRST(pe_list); +TAILQ_REMOVE(pe_list, pe, entries); +free_pam_entry(pe); +} +} + static void usage(void) { &lt; at &gt;&lt; at &gt; -165,6 +259,9 &lt; at &gt;&lt; at &gt; clean(char *str) { char *ptr; + +if (str == NULL) +return (NULL); while (isspace(*str)) str++; &lt; at &gt;&lt; at &gt; -173,6 +270,7 &lt; at &gt;&lt; at &gt; *ptr = 0; ptr--; } + return (str); } &lt; at &gt;&lt; at &gt; -638,7 +736,7 &lt; at &gt;&lt; at &gt; TAILQ_REMOVE(pel, pe, entries); TAILQ_REMOVE(&amp;pam_fentries, pe, fentries); free_pam_entry(pe); -} +} /* *this is a include entry. If no service was specified, Modified: pcbsd-projects/AD_4_PCBSD/pam/pamconf.h =================================================================== --- pcbsd-projects/AD_4_PCBSD/pam/pamconf.h2012-07-16 21:47:49 UTC (rev 17787) +++ pcbsd-projects/AD_4_PCBSD/pam/pamconf.h2012-07-17 03:44:47 UTC (rev 17788) &lt; at &gt;&lt; at &gt; -108,5 +108,10 &lt; at &gt;&lt; at &gt; #definexfree(p) _xfree((char **)p) +externstruct pam_entry *new_pam_entry(int facility); +externvoid free_arguments(struct pam_entry *pe); +externvoid free_pam_entry(struct pam_entry *pe); +externvoid free_pam_entries(struct pam_entry_list *pe_list); + #endif/* __PAMCONF_H */ </pre> svn-E1R8x85rdljYtjvyW6yDsg< at >public.gmane.org 2012-07-17T03:44:48 [PC-BSD Commits] r17787 - in pcbsd-projects/AD_4_PCBSD: nss rcscripts http://comments.gmane.org/gmane.os.pcbsd.scm/17336 <pre>Author: johnh Date: 2012-07-16 21:47:49 +0000 (Mon, 16 Jul 2012) New Revision: 17787 Added: pcbsd-projects/AD_4_PCBSD/scripts/pc-adctl Modified: pcbsd-projects/AD_4_PCBSD/nss/nssconf.c pcbsd-projects/AD_4_PCBSD/rc/rc.AD pcbsd-projects/AD_4_PCBSD/scripts/Makefile pcbsd-projects/AD_4_PCBSD/scripts/pc-kerberos pcbsd-projects/AD_4_PCBSD/scripts/pc-nsswitch pcbsd-projects/AD_4_PCBSD/scripts/pc-samba Log: Some bugfixes, progress, adctl for starting/stopping all the AD services. Still a work in progress. Modified: pcbsd-projects/AD_4_PCBSD/nss/nssconf.c =================================================================== --- pcbsd-projects/AD_4_PCBSD/nss/nssconf.c2012-07-16 20:36:46 UTC (rev 17786) +++ pcbsd-projects/AD_4_PCBSD/nss/nssconf.c2012-07-16 21:47:49 UTC (rev 17787) &lt; at &gt;&lt; at &gt; -58,13 +58,14 &lt; at &gt;&lt; at &gt; usage(void) { fprintf(stderr, -"usage: nssconf &lt;(+|^|-|)database&gt; [options]\n" +"usage: nssconf [options]\n" "Where option in:\n\n" "\t-f &lt;input file&gt;\n" -"\t-o &lt;output file\n" -"\t-r\n" +"\t-o &lt;output file&gt;\n" +"\t-d &lt;(+|^|-)database&gt;\n" "\t-c &lt;(+|-)(index)?criteria&gt;\n" -"\t-s &lt;(+|-)(index)?source&gt;\n\n" +"\t-s &lt;(+|-)(index)?source&gt;\n" +"\t-r\n\n" ); exit(1); &lt; at &gt;&lt; at &gt; -465,6 +466,7 &lt; at &gt;&lt; at &gt; if (nim-&gt;index &lt; 0) { TAILQ_INSERT_TAIL(&amp;node-&gt;info, new, entries); TAILQ_REMOVE(&amp;nm-&gt;info, nim, entries); +node-&gt;ninfo++; } else { struct nss_entry_info *nei, *neitmp; &lt; at &gt;&lt; at &gt; -474,6 +476,7 &lt; at &gt;&lt; at &gt; if (nim-&gt;index == nei-&gt;index) { TAILQ_INSERT_BEFORE(nei, new, entries); TAILQ_REMOVE(&amp;nm-&gt;info, nim, entries); +node-&gt;ninfo++; inserted = 1; break; } &lt; at &gt;&lt; at &gt; -483,6 +486,7 &lt; at &gt;&lt; at &gt; if (inserted != 1) { TAILQ_INSERT_TAIL(&amp;node-&gt;info, new, entries); TAILQ_REMOVE(&amp;nm-&gt;info, nim, entries); +node-&gt;ninfo++; } update_indexes(node); &lt; at &gt;&lt; at &gt; -504,6 +508,7 &lt; at &gt;&lt; at &gt; TAILQ_REMOVE(&amp;node-&gt;info, nei, entries); xfree(&amp;nei-&gt;neis_source); xfree(&amp;nei); +node-&gt;ninfo--; break; } } &lt; at &gt;&lt; at &gt; -522,6 +527,7 &lt; at &gt;&lt; at &gt; if (nim-&gt;index &lt; 0) { TAILQ_INSERT_TAIL(&amp;node-&gt;info, new, entries); TAILQ_REMOVE(&amp;nm-&gt;info, nim, entries); +node-&gt;ninfo++; } else { struct nss_entry_info *nei, *neitmp; &lt; at &gt;&lt; at &gt; -531,15 +537,16 &lt; at &gt;&lt; at &gt; if (nim-&gt;index == nei-&gt;index) { TAILQ_INSERT_BEFORE(nei, new, entries); TAILQ_REMOVE(&amp;nm-&gt;info, nim, entries); +node-&gt;ninfo++; inserted = 1; break; } - } if (inserted != 1) { TAILQ_INSERT_TAIL(&amp;node-&gt;info, new, entries); TAILQ_REMOVE(&amp;nm-&gt;info, nim, entries); +node-&gt;ninfo++; } update_indexes(node); &lt; at &gt;&lt; at &gt; -558,6 +565,7 &lt; at &gt;&lt; at &gt; if (nei-&gt;type == NSS_ENTRY_INFO_CRITERIA &amp;&amp; nei-&gt;neic_status == nim-&gt;nimc_status) { TAILQ_REMOVE(&amp;node-&gt;info, nei, entries); +node-&gt;ninfo--; xfree(&amp;nei); break; } Modified: pcbsd-projects/AD_4_PCBSD/rc/rc.AD =================================================================== --- pcbsd-projects/AD_4_PCBSD/rc/rc.AD2012-07-16 20:36:46 UTC (rev 17786) +++ pcbsd-projects/AD_4_PCBSD/rc/rc.AD2012-07-16 21:47:49 UTC (rev 17787) &lt; at &gt;&lt; at &gt; -107,6 +107,12 &lt; at &gt;&lt; at &gt; # +#Active Directory config +# +: ${AD_CONF:="/usr/local/etc/AD.conf"} + + +# #Active Directory Functions # __get_SRV_record() &lt; at &gt;&lt; at &gt; -412,7 +418,7 &lt; at &gt;&lt; at &gt; AD_init() { -local adconf="AD.conf" +local adconf="${AD_CONF}" local tmpfile="$(mktemp -q /var/tmp/.adfooXXXXXX)" egrep -v '^[[:space:]]+$|^$|^#|^[[:space:]]+#' &lt; "${adconf}" &gt; "${tmpfile}" Modified: pcbsd-projects/AD_4_PCBSD/scripts/Makefile =================================================================== --- pcbsd-projects/AD_4_PCBSD/scripts/Makefile2012-07-16 20:36:46 UTC (rev 17786) +++ pcbsd-projects/AD_4_PCBSD/scripts/Makefile2012-07-16 21:47:49 UTC (rev 17787) &lt; at &gt;&lt; at &gt; -1,4 +1,5 &lt; at &gt;&lt; at &gt; -FILES=pc-activedirectory pc-kerberos pc-kinit pc-nsswitch pc-pam pc-samba +FILES=pc-activedirectory pc-kerberos pc-kinit pc-nsswitch pc-pam \ +pc-samba pc-adctl FILESMODE=0555 FILESDIR=/usr/local/etc/rc.d Modified: pcbsd-projects/AD_4_PCBSD/scripts/pc-kerberos =================================================================== --- pcbsd-projects/AD_4_PCBSD/scripts/pc-kerberos2012-07-16 20:36:46 UTC (rev 17786) +++ pcbsd-projects/AD_4_PCBSD/scripts/pc-kerberos2012-07-16 21:47:49 UTC (rev 17787) &lt; at &gt;&lt; at &gt; -68,6 +68,8 &lt; at &gt;&lt; at &gt; generate_kerberos_files() { +: ${activedirectory_krb5conf_overwrite:="YES"} + if checkyesno activedirectory_enable 2&gt;/dev/null then AD_init &lt; at &gt;&lt; at &gt; -78,8 +80,11 &lt; at &gt;&lt; at &gt; adminname=$(AD_get adminname) adminpw=$(AD_get adminpw) -generate_krb5_conf "${dcname}" "${domainname}" \ -"${netbiosname}" "${adminname}" "${adminpw}" +if checkyesno activedirectory_krb5conf_overwrite 2&gt;/dev/null +then +generate_krb5_conf "${dcname}" "${domainname}" \ +"${netbiosname}" "${adminname}" "${adminpw}" +fi fi } Modified: pcbsd-projects/AD_4_PCBSD/scripts/pc-nsswitch =================================================================== --- pcbsd-projects/AD_4_PCBSD/scripts/pc-nsswitch2012-07-16 20:36:46 UTC (rev 17786) +++ pcbsd-projects/AD_4_PCBSD/scripts/pc-nsswitch2012-07-16 21:47:49 UTC (rev 17787) &lt; at &gt;&lt; at &gt; -10,59 +10,57 &lt; at &gt;&lt; at &gt; . /usr/local/etc/rc.AD : ${PATH_NS_CONF:="/etc/nsswitch.conf"} +: ${NSSCONF:="/usr/local/bin/nssconf"} -generate_nsswitch_conf() +nsswitch_conf_start() { -local ldap=0 -local ad=0 -local conf="${PATH_NS_CONF}" - if checkyesno activedirectory_enable 2&gt;/dev/null then -ad=1 +local tmp=$(mktemp /tmp/ns.XXXXXX) + +${NSSCONF} -f "${PATH_NS_CONF}" \ +-d group -r -s "+files" -s "+winbind" \ +-d passwd -r -s "+files" -s "+winbind" \ +-o "${tmp}" + +if [ "$?" = "0" -a -s "${tmp}" ] +then +mv "${tmp}" "${PATH_NS_CONF}" +return 0 +fi + +return 1 fi -if checkyesno ldap_enable 2&gt;/dev/null -then -ldap=1 -fi -local p="compat" -local g="compat" +return 0 +} -if [ "${ldap}" = "1" -o "${ad}" = "1" ] +nsswitch_conf_stop() +{ +if checkyesno activedirectory_enable 2&gt;/dev/null then -p="files" -g="files" +local tmp=$(mktemp /tmp/ns.XXXXXX) -if [ "${ad}" = "1" ] -then -p="${p} winbind" -g="${g} winbind" +${NSSCONF} -f "${PATH_NS_CONF}" \ +-d group -s "-winbind" \ +-d passwd -s "-winbind" \ +-o "${tmp}" -elif [ "${ldap}" = "1" ] +if [ "$?" = "0" -a -s "${tmp}" ] then -p="${p} ldap" -g="${g} ldap" +mv "${tmp}" "${PATH_NS_CONF}" +return 0 fi + +return 1 fi - -cat&lt;&lt;-__EOF__&gt;"${conf}" -group: ${g} -hosts: files dns -networks: files -passwd: ${p} -shells: files -services: files -protocols: files -rpc: files -__EOF__ - + return 0 } name="pc-nsswitch" -start_cmd='generate_nsswitch_conf' -stop_cmd=':' +start_cmd='nsswitch_conf_start' +stop_cmd='nsswitch_conf_stop' load_rc_config $name run_rc_command "$1" Modified: pcbsd-projects/AD_4_PCBSD/scripts/pc-samba =================================================================== --- pcbsd-projects/AD_4_PCBSD/scripts/pc-samba2012-07-16 20:36:46 UTC (rev 17786) +++ pcbsd-projects/AD_4_PCBSD/scripts/pc-samba2012-07-16 21:47:49 UTC (rev 17787) &lt; at &gt;&lt; at &gt; -11,59 +11,50 &lt; at &gt;&lt; at &gt; . /usr/local/etc/rc.AD : ${SMB_CONF:="/usr/local/etc/smb.conf"} -: ${SMB_AD_CONF:="/usr/local/etc/smb.AD.conf"} +: ${SAMBACONF:="/usr/local/bin/sambaconf"} -generate_smbadconf() +generate_smbconf() { if checkyesno activedirectory_enable 2&gt;/dev/null then AD_init -cat &lt;&lt;-__EOF__&gt;"${SMB_AD_CONF}" -security = ADS -realm = $(AD_get domainname | tr a-z A-Z) -workgroup = $(AD_get workgroup) -netbios name = $(AD_get netbiosname) -client use spnego = yes - -wins server = $(AD_get dcname) -password server = $(AD_get dcname) - -local master = no -domain master = no -preferred master = no - -inherit acls = yes -acl compatibility = auto -acl check permissions = true -acl map full control = true -dos filemode = yes - -idmap uid = 10000-19999 -idmap gid = 10000-19999 -idmap config $(AD_get workgroup): backend = rid -idmap config $(AD_get workgroup): range = 20000-20000000 - -winbind cache time = 10 -winbind offline logon = yes -winbind enum users = yes -winbind enum groups = yes -winbind nested groups = yes -winbind use default domain = yes -winbind refresh tickets = yes - -allow trusted domains = yes - -template shell = /bin/sh -template homedir = /home/%U -__EOF__ - +${SAMBACONF} -f ${SMB_CONF} \ +-w -m "+global:security=ADS" \ +-w -m "+global:realm=$(AD_get domainname | tr a-z A-Z)" \ +-w -m "+global:workgroup=$(AD_get workgroup)" \ +-w -m "+global:netbios name=$(AD_get netbiosname)" \ +-w -m "+global:client use spnego=yes" \ +-w -m "+global:wins server=$(AD_get dcname)" \ +-w -m "+global:password server=$(AD_get dcname)" \ +-w -m "+global:local master=no" \ +-w -m "+global:domain master=no" \ +-w -m "+global:preferred master=no" \ +-w -m "+global:inherit acls=yes" \ +-w -m "+global:acl compatibility=auto" \ +-w -m "+global:acl check permissions=true" \ +-w -m "+global:acl map full control=true" \ +-w -m "+global:dos filemode=yes" \ +-w -m "+global:idmap uid=10000-19999" \ +-w -m "+global:idmap gid=10000-19999" \ +-w -m "+global:idmap config $(AD_get workgroup): backend=rid" \ +-w -m "+global:idmap config $(AD_get workgroup): range=20000-20000000" \ +-w -m "+global:winbind cache time=10" \ +-w -m "+global:winbind offline logon=yes" \ +-w -m "+global:winbind enum users=yes" \ +-w -m "+global:winbind enum groups=yes" \ +-w -m "+global:winbind nested groups=yes" \ +-w -m "+global:winbind use default domain=yes" \ +-w -m "+global:winbind refresh tickets=yes" \ +-w -m "+global:allow trusted domains=yes" \ +-w -m "+global:template shell=/bin/sh" \ +-w -m "+global: template homedir=/home/%U" fi } name="pc-samba" -start_cmd='generate_smbadconf' +start_cmd='generate_smbconf' stop_cmd=':' load_rc_config $name </pre> svn-E1R8x85rdljYtjvyW6yDsg< at >public.gmane.org 2012-07-16T21:47:49 [PC-BSD Commits] r17786 - in pbi/modules: graphics graphics/gtkamgraphics/gtkam/resources graphics/gtkam/xdg-desktopgraphics/gtkam/xdg-menu multimedia multimedia/pwcviewmultimedia/pwcview/resources http://comments.gmane.org/gmane.os.pcbsd.scm/17335 <pre>Author: kenmoore Date: 2012-07-16 20:36:46 +0000 (Mon, 16 Jul 2012) New Revision: 17786 Added: pbi/modules/graphics/gtkam/ pbi/modules/graphics/gtkam/external-links pbi/modules/graphics/gtkam/pbi.conf pbi/modules/graphics/gtkam/resources/ pbi/modules/graphics/gtkam/resources/gtkam.png pbi/modules/graphics/gtkam/scripts/ pbi/modules/graphics/gtkam/xdg-desktop/ pbi/modules/graphics/gtkam/xdg-desktop/gtkam.desktop pbi/modules/graphics/gtkam/xdg-menu/ pbi/modules/graphics/gtkam/xdg-menu/gtkam.desktop pbi/modules/graphics/gtkam/xdg-mime/ pbi/modules/multimedia/pwcview/ pbi/modules/multimedia/pwcview/external-links pbi/modules/multimedia/pwcview/pbi.conf pbi/modules/multimedia/pwcview/resources/ pbi/modules/multimedia/pwcview/resources/pwcview.png pbi/modules/multimedia/pwcview/scripts/ pbi/modules/multimedia/pwcview/xdg-desktop/ pbi/modules/multimedia/pwcview/xdg-menu/ pbi/modules/multimedia/pwcview/xdg-mime/ Log: Add modules for multimedia/pwcview and graphics/gtkam. Thanks to "nemysis" for the modules Index: pbi/modules/graphics/gtkam/pbi.conf =================================================================== --- pbi/modules/graphics/gtkam/pbi.conf2012-07-16 20:24:23 UTC (rev 17785) +++ pbi/modules/graphics/gtkam/pbi.conf2012-07-16 20:36:46 UTC (rev 17786) Property changes on: pbi/modules/graphics/gtkam/pbi.conf ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* Index: pbi/modules/graphics/gtkam/resources/gtkam.png =================================================================== --- pbi/modules/graphics/gtkam/resources/gtkam.png2012-07-16 20:24:23 UTC (rev 17785) +++ pbi/modules/graphics/gtkam/resources/gtkam.png2012-07-16 20:36:46 UTC (rev 17786) Property changes on: pbi/modules/graphics/gtkam/resources/gtkam.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png Index: pbi/modules/multimedia/pwcview/pbi.conf =================================================================== --- pbi/modules/multimedia/pwcview/pbi.conf2012-07-16 20:24:23 UTC (rev 17785) +++ pbi/modules/multimedia/pwcview/pbi.conf2012-07-16 20:36:46 UTC (rev 17786) Property changes on: pbi/modules/multimedia/pwcview/pbi.conf ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* Index: pbi/modules/multimedia/pwcview/resources/pwcview.png =================================================================== --- pbi/modules/multimedia/pwcview/resources/pwcview.png2012-07-16 20:24:23 UTC (rev 17785) +++ pbi/modules/multimedia/pwcview/resources/pwcview.png2012-07-16 20:36:46 UTC (rev 17786) Property changes on: pbi/modules/multimedia/pwcview/resources/pwcview.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png </pre> svn-E1R8x85rdljYtjvyW6yDsg< at >public.gmane.org 2012-07-16T20:36:47 [PC-BSD Commits] r17785 - in pbi/modules/games: . stepbillstepbill/resources xbill xbill/resources xbill/xdg-desktopxbill/xdg-menu xtux xtux/resources xtux/xdg-desktop xtux/xdg-menu http://comments.gmane.org/gmane.os.pcbsd.scm/17334 <pre>Author: kenmoore Date: 2012-07-16 20:24:23 +0000 (Mon, 16 Jul 2012) New Revision: 17785 Added: pbi/modules/games/stepbill/ pbi/modules/games/stepbill/external-links pbi/modules/games/stepbill/pbi.conf pbi/modules/games/stepbill/resources/ pbi/modules/games/stepbill/resources/stepbill.png pbi/modules/games/stepbill/scripts/ pbi/modules/games/stepbill/xdg-desktop/ pbi/modules/games/stepbill/xdg-menu/ pbi/modules/games/stepbill/xdg-mime/ pbi/modules/games/xbill/ pbi/modules/games/xbill/external-links pbi/modules/games/xbill/pbi.conf pbi/modules/games/xbill/resources/ pbi/modules/games/xbill/resources/XBill.png pbi/modules/games/xbill/scripts/ pbi/modules/games/xbill/xdg-desktop/ pbi/modules/games/xbill/xdg-desktop/xbill.desktop pbi/modules/games/xbill/xdg-menu/ pbi/modules/games/xbill/xdg-menu/xbill.desktop pbi/modules/games/xbill/xdg-mime/ pbi/modules/games/xtux/ pbi/modules/games/xtux/external-links pbi/modules/games/xtux/pbi.conf pbi/modules/games/xtux/resources/ pbi/modules/games/xtux/resources/XTux.png pbi/modules/games/xtux/scripts/ pbi/modules/games/xtux/xdg-desktop/ pbi/modules/games/xtux/xdg-desktop/tux_serv.desktop pbi/modules/games/xtux/xdg-desktop/xtux.desktop pbi/modules/games/xtux/xdg-menu/ pbi/modules/games/xtux/xdg-menu/tux_serv.desktop pbi/modules/games/xtux/xdg-menu/xtux.desktop pbi/modules/games/xtux/xdg-mime/ Log: Add modules for games/[stepbill, xbill, xtux]. Thanks to "nemysis" for the modules. Index: pbi/modules/games/stepbill/resources/stepbill.png =================================================================== --- pbi/modules/games/stepbill/resources/stepbill.png2012-07-16 20:19:27 UTC (rev 17784) +++ pbi/modules/games/stepbill/resources/stepbill.png2012-07-16 20:24:23 UTC (rev 17785) Property changes on: pbi/modules/games/stepbill/resources/stepbill.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png Index: pbi/modules/games/xbill/resources/XBill.png =================================================================== --- pbi/modules/games/xbill/resources/XBill.png2012-07-16 20:19:27 UTC (rev 17784) +++ pbi/modules/games/xbill/resources/XBill.png2012-07-16 20:24:23 UTC (rev 17785) Property changes on: pbi/modules/games/xbill/resources/XBill.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png Index: pbi/modules/games/xtux/resources/XTux.png =================================================================== --- pbi/modules/games/xtux/resources/XTux.png2012-07-16 20:19:27 UTC (rev 17784) +++ pbi/modules/games/xtux/resources/XTux.png2012-07-16 20:24:23 UTC (rev 17785) Property changes on: pbi/modules/games/xtux/resources/XTux.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png </pre> svn-E1R8x85rdljYtjvyW6yDsg< at >public.gmane.org 2012-07-16T20:24:23 [PC-BSD Commits] r17784 - pcbsd-projects/AD_4_PCBSD/samba http://comments.gmane.org/gmane.os.pcbsd.scm/17333 <pre>Author: johnh Date: 2012-07-16 20:19:27 +0000 (Mon, 16 Jul 2012) New Revision: 17784 Modified: pcbsd-projects/AD_4_PCBSD/samba/sambaconf.c Log: Add overwrite support Modified: pcbsd-projects/AD_4_PCBSD/samba/sambaconf.c =================================================================== --- pcbsd-projects/AD_4_PCBSD/samba/sambaconf.c2012-07-16 20:09:58 UTC (rev 17783) +++ pcbsd-projects/AD_4_PCBSD/samba/sambaconf.c2012-07-16 20:19:27 UTC (rev 17784) &lt; at &gt;&lt; at &gt; -16,6 +16,7 &lt; at &gt;&lt; at &gt; char *section; char *name; char *value; +int overwrite; int op; }; TAILQ_HEAD(smb_modification_list, smb_modification) modifications = &lt; at &gt;&lt; at &gt; -65,7 +66,8 &lt; at &gt;&lt; at &gt; "Where option in:\n\n" "\t-f &lt;input file&gt;\n" "\t-o &lt;output file&gt;\n" -"\t-m &lt;(+|^|-)section:name:value)&gt;\n\n" +"\t-m &lt;(+|^|-)section:name=value)&gt;\n" +"\t-w\n\n" ); exit(1); &lt; at &gt;&lt; at &gt; -144,7 +146,7 &lt; at &gt;&lt; at &gt; } static int -add_modification(const char *m) +add_modification(const char *m, int overwrite) { int i; char *ptr, *eptr, *save; &lt; at &gt;&lt; at &gt; -176,6 +178,7 &lt; at &gt;&lt; at &gt; sm-&gt;section = NULL; sm-&gt;name = NULL; sm-&gt;value = NULL; +sm-&gt;overwrite = overwrite; save = ptr = xstrdup(&amp;m[1]); section = strsep(&amp;ptr, ":"); &lt; at &gt;&lt; at &gt; -226,6 +229,22 &lt; at &gt;&lt; at &gt; node = se; } +if (sm-&gt;overwrite) { +struct smb_entry *save; + +save = node; +TAILQ_FOREACH(se, &amp;fentries, entries) { +if (se-&gt;type == SMB_ENTRY_PARAMETERS &amp;&amp; +strcmp(se-&gt;sep_name, sm-&gt;name) == 0) { +xfree(&amp;se-&gt;sep_value); +se-&gt;sep_value = xstrdup(sm-&gt;value); +return (0); +} +} + +node = save; +} + if (node != NULL) { struct smb_entry *new = xalloc(sizeof(*new)); new-&gt;type = SMB_ENTRY_PARAMETERS; &lt; at &gt;&lt; at &gt; -352,14 +371,15 &lt; at &gt;&lt; at &gt; int main(int argc, char **argv) { -int ch; +int ch, overwrite; char *infile, *outfile; if (argc &lt;= 1) usage(); +overwrite = 0; infile = outfile = NULL; -while ((ch = getopt(argc, argv, "f:m:o:")) != -1) { +while ((ch = getopt(argc, argv, "f:m:o:w")) != -1) { switch (ch) { case 'f': xfree(&amp;infile); &lt; at &gt;&lt; at &gt; -367,13 +387,18 &lt; at &gt;&lt; at &gt; break; case 'm': -add_modification(optarg); +add_modification(optarg, overwrite); +overwrite = 0; break; case 'o': xfree(&amp;outfile); outfile = xstrdup(optarg); break; + +case 'w': +overwrite = 1; +break; case '?': default: </pre> svn-E1R8x85rdljYtjvyW6yDsg< at >public.gmane.org 2012-07-16T20:19:27 [PC-BSD Commits] r17783 - pcbsd/current/src-qt4/about-gui http://comments.gmane.org/gmane.os.pcbsd.scm/17332 <pre>Author: kris Date: 2012-07-16 20:09:58 +0000 (Mon, 16 Jul 2012) New Revision: 17783 Modified: pcbsd/current/src-qt4/about-gui/mainwindow.ui Log: Remove a whitespace Modified: pcbsd/current/src-qt4/about-gui/mainwindow.ui =================================================================== (Binary files differ) </pre> svn-E1R8x85rdljYtjvyW6yDsg< at >public.gmane.org 2012-07-16T20:09:58 [PC-BSD Commits] r17782 - pcbsd/current/build-files/src-patches http://comments.gmane.org/gmane.os.pcbsd.scm/17331 <pre>Author: kris Date: 2012-07-16 20:01:53 +0000 (Mon, 16 Jul 2012) New Revision: 17782 Added: pcbsd/current/build-files/src-patches/patch-pc-sysinstall-TRIM Log: Add patch for TRIM support to pc-sysinstall, enabled by default, since it gets automatically turned off if its not supported. </pre> svn-E1R8x85rdljYtjvyW6yDsg< at >public.gmane.org 2012-07-16T20:01:53 [PC-BSD Commits] r17781 - in pbi/modules/games: . ceferinoceferino/resources ceferino/xdg-desktop ceferino/xdg-menucircuslinux circuslinux/resources circuslinux/xdg-desktopcircuslinux/xdg-menu flobopuyo flobopuyo/resourcesflobopuyo/xdg-desktop flobopuyo/xdg-menu flyhardflyhard/resources flyhard/xdg-desktop flyhard/xdg-menuformido formido/resources formido/xdg-desktopformido/xdg-menu njam njam/resources njam/xdg-desktop njam/xdg-menu http://comments.gmane.org/gmane.os.pcbsd.scm/17330 <pre>Author: kenmoore Date: 2012-07-16 19:49:29 +0000 (Mon, 16 Jul 2012) New Revision: 17781 Added: pbi/modules/games/ceferino/ pbi/modules/games/ceferino/external-links pbi/modules/games/ceferino/pbi.conf pbi/modules/games/ceferino/resources/ pbi/modules/games/ceferino/resources/fuente1.png pbi/modules/games/ceferino/scripts/ pbi/modules/games/ceferino/xdg-desktop/ pbi/modules/games/ceferino/xdg-desktop/ceferino.desktop pbi/modules/games/ceferino/xdg-desktop/ceferinoeditor.desktop pbi/modules/games/ceferino/xdg-desktop/ceferinosetup.desktop pbi/modules/games/ceferino/xdg-menu/ pbi/modules/games/ceferino/xdg-menu/ceferino.desktop pbi/modules/games/ceferino/xdg-menu/ceferinoeditor.desktop pbi/modules/games/ceferino/xdg-menu/ceferinosetup.desktop pbi/modules/games/ceferino/xdg-mime/ pbi/modules/games/circuslinux/ pbi/modules/games/circuslinux/external-links pbi/modules/games/circuslinux/pbi.conf pbi/modules/games/circuslinux/resources/ pbi/modules/games/circuslinux/resources/icon.png pbi/modules/games/circuslinux/scripts/ pbi/modules/games/circuslinux/xdg-desktop/ pbi/modules/games/circuslinux/xdg-desktop/circuslinux.desktop pbi/modules/games/circuslinux/xdg-menu/ pbi/modules/games/circuslinux/xdg-menu/circuslinux.desktop pbi/modules/games/circuslinux/xdg-mime/ pbi/modules/games/flobopuyo/ pbi/modules/games/flobopuyo/external-links pbi/modules/games/flobopuyo/pbi.conf pbi/modules/games/flobopuyo/resources/ pbi/modules/games/flobopuyo/resources/Neutral.png pbi/modules/games/flobopuyo/scripts/ pbi/modules/games/flobopuyo/xdg-desktop/ pbi/modules/games/flobopuyo/xdg-desktop/flobopuyo.desktop pbi/modules/games/flobopuyo/xdg-menu/ pbi/modules/games/flobopuyo/xdg-menu/flobopuyo.desktop pbi/modules/games/flobopuyo/xdg-mime/ pbi/modules/games/flyhard/ pbi/modules/games/flyhard/external-links pbi/modules/games/flyhard/pbi.conf pbi/modules/games/flyhard/resources/ pbi/modules/games/flyhard/resources/title.png pbi/modules/games/flyhard/scripts/ pbi/modules/games/flyhard/xdg-desktop/ pbi/modules/games/flyhard/xdg-desktop/flyhard.desktop pbi/modules/games/flyhard/xdg-menu/ pbi/modules/games/flyhard/xdg-menu/flyhard.desktop pbi/modules/games/flyhard/xdg-mime/ pbi/modules/games/formido/ pbi/modules/games/formido/external-links pbi/modules/games/formido/pbi.conf pbi/modules/games/formido/resources/ pbi/modules/games/formido/resources/Formido.png pbi/modules/games/formido/scripts/ pbi/modules/games/formido/xdg-desktop/ pbi/modules/games/formido/xdg-desktop/formido.desktop pbi/modules/games/formido/xdg-menu/ pbi/modules/games/formido/xdg-menu/formido.desktop pbi/modules/games/formido/xdg-mime/ pbi/modules/games/njam/ pbi/modules/games/njam/external-links pbi/modules/games/njam/pbi.conf pbi/modules/games/njam/resources/ pbi/modules/games/njam/resources/Njam.png pbi/modules/games/njam/scripts/ pbi/modules/games/njam/xdg-desktop/ pbi/modules/games/njam/xdg-desktop/njam.desktop pbi/modules/games/njam/xdg-menu/ pbi/modules/games/njam/xdg-menu/njam.desktop pbi/modules/games/njam/xdg-mime/ Log: Add modules for games/[formido, flobopuyo, flyhard, ceferino, circuslinux, njam]. Thanks to "nemysis" for the modules Index: pbi/modules/games/ceferino/resources/fuente1.png =================================================================== --- pbi/modules/games/ceferino/resources/fuente1.png2012-07-16 19:26:10 UTC (rev 17780) +++ pbi/modules/games/ceferino/resources/fuente1.png2012-07-16 19:49:29 UTC (rev 17781) Property changes on: pbi/modules/games/ceferino/resources/fuente1.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png Index: pbi/modules/games/circuslinux/resources/icon.png =================================================================== --- pbi/modules/games/circuslinux/resources/icon.png2012-07-16 19:26:10 UTC (rev 17780) +++ pbi/modules/games/circuslinux/resources/icon.png2012-07-16 19:49:29 UTC (rev 17781) Property changes on: pbi/modules/games/circuslinux/resources/icon.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png Index: pbi/modules/games/flobopuyo/resources/Neutral.png =================================================================== --- pbi/modules/games/flobopuyo/resources/Neutral.png2012-07-16 19:26:10 UTC (rev 17780) +++ pbi/modules/games/flobopuyo/resources/Neutral.png2012-07-16 19:49:29 UTC (rev 17781) Property changes on: pbi/modules/games/flobopuyo/resources/Neutral.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png Index: pbi/modules/games/flyhard/resources/title.png =================================================================== --- pbi/modules/games/flyhard/resources/title.png2012-07-16 19:26:10 UTC (rev 17780) +++ pbi/modules/games/flyhard/resources/title.png2012-07-16 19:49:29 UTC (rev 17781) Property changes on: pbi/modules/games/flyhard/resources/title.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png Index: pbi/modules/games/formido/resources/Formido.png =================================================================== --- pbi/modules/games/formido/resources/Formido.png2012-07-16 19:26:10 UTC (rev 17780) +++ pbi/modules/games/formido/resources/Formido.png2012-07-16 19:49:29 UTC (rev 17781) Property changes on: pbi/modules/games/formido/resources/Formido.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png Index: pbi/modules/games/njam/resources/Njam.png =================================================================== --- pbi/modules/games/njam/resources/Njam.png2012-07-16 19:26:10 UTC (rev 17780) +++ pbi/modules/games/njam/resources/Njam.png2012-07-16 19:49:29 UTC (rev 17781) Property changes on: pbi/modules/games/njam/resources/Njam.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png </pre> svn-E1R8x85rdljYtjvyW6yDsg< at >public.gmane.org 2012-07-16T19:49:29 [PC-BSD Commits] r17775 - in pbi/modules/games: .super_methane_brothers super_methane_brothers/resourcessuper_methane_brothers/xdg-desktopsuper_methane_brothers/xdg-menu tecnoballztecnoballz/resources tecnoballz/xdg-desktoptecnoballz/xdg-menu tuxpuck tuxpuck/resourcestuxpuck/xdg-desktop tuxpuck/xdg-menu whichwayisupwhichwayisup/resources whichwayisup/xdg-desktopwhichwayisup/xdg-menu http://comments.gmane.org/gmane.os.pcbsd.scm/17329 <pre>Author: kenmoore Date: 2012-07-16 19:03:31 +0000 (Mon, 16 Jul 2012) New Revision: 17775 Added: pbi/modules/games/super_methane_brothers/ pbi/modules/games/super_methane_brothers/external-links pbi/modules/games/super_methane_brothers/pbi.conf pbi/modules/games/super_methane_brothers/resources/ pbi/modules/games/super_methane_brothers/resources/super-methane-bros.png pbi/modules/games/super_methane_brothers/scripts/ pbi/modules/games/super_methane_brothers/xdg-desktop/ pbi/modules/games/super_methane_brothers/xdg-desktop/methane.desktop pbi/modules/games/super_methane_brothers/xdg-menu/ pbi/modules/games/super_methane_brothers/xdg-menu/methane.desktop pbi/modules/games/super_methane_brothers/xdg-mime/ pbi/modules/games/tecnoballz/ pbi/modules/games/tecnoballz/external-links pbi/modules/games/tecnoballz/pbi.conf pbi/modules/games/tecnoballz/resources/ pbi/modules/games/tecnoballz/resources/TecnoballZ.png pbi/modules/games/tecnoballz/scripts/ pbi/modules/games/tecnoballz/xdg-desktop/ pbi/modules/games/tecnoballz/xdg-desktop/tecnoballz.desktop pbi/modules/games/tecnoballz/xdg-menu/ pbi/modules/games/tecnoballz/xdg-menu/tecnoballz.desktop pbi/modules/games/tecnoballz/xdg-mime/ pbi/modules/games/tuxpuck/ pbi/modules/games/tuxpuck/external-links pbi/modules/games/tuxpuck/pbi.conf pbi/modules/games/tuxpuck/resources/ pbi/modules/games/tuxpuck/resources/tuxpuck.png pbi/modules/games/tuxpuck/scripts/ pbi/modules/games/tuxpuck/xdg-desktop/ pbi/modules/games/tuxpuck/xdg-desktop/tuxpuck.desktop pbi/modules/games/tuxpuck/xdg-menu/ pbi/modules/games/tuxpuck/xdg-menu/tuxpuck.desktop pbi/modules/games/tuxpuck/xdg-mime/ pbi/modules/games/whichwayisup/ pbi/modules/games/whichwayisup/external-links pbi/modules/games/whichwayisup/pbi.conf pbi/modules/games/whichwayisup/resources/ pbi/modules/games/whichwayisup/resources/whichwayisup.png pbi/modules/games/whichwayisup/scripts/ pbi/modules/games/whichwayisup/xdg-desktop/ pbi/modules/games/whichwayisup/xdg-desktop/whichwayisup.desktop pbi/modules/games/whichwayisup/xdg-menu/ pbi/modules/games/whichwayisup/xdg-menu/whichwayisup.desktop pbi/modules/games/whichwayisup/xdg-mime/ Log: Add modules for games/[whichwayisup,super_methane_brothers,tecnoballz,tuxpuck]. Thanks to "nemysis" for the modules. Index: pbi/modules/games/super_methane_brothers/resources/super-methane-bros.png =================================================================== --- pbi/modules/games/super_methane_brothers/resources/super-methane-bros.png2012-07-16 18:57:16 UTC (rev 17774) +++ pbi/modules/games/super_methane_brothers/resources/super-methane-bros.png2012-07-16 19:03:31 UTC (rev 17775) Property changes on: pbi/modules/games/super_methane_brothers/resources/super-methane-bros.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png Index: pbi/modules/games/tecnoballz/resources/TecnoballZ.png =================================================================== --- pbi/modules/games/tecnoballz/resources/TecnoballZ.png2012-07-16 18:57:16 UTC (rev 17774) +++ pbi/modules/games/tecnoballz/resources/TecnoballZ.png2012-07-16 19:03:31 UTC (rev 17775) Property changes on: pbi/modules/games/tecnoballz/resources/TecnoballZ.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png Index: pbi/modules/games/tuxpuck/resources/tuxpuck.png =================================================================== --- pbi/modules/games/tuxpuck/resources/tuxpuck.png2012-07-16 18:57:16 UTC (rev 17774) +++ pbi/modules/games/tuxpuck/resources/tuxpuck.png2012-07-16 19:03:31 UTC (rev 17775) Property changes on: pbi/modules/games/tuxpuck/resources/tuxpuck.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png Index: pbi/modules/games/whichwayisup/resources/whichwayisup.png =================================================================== --- pbi/modules/games/whichwayisup/resources/whichwayisup.png2012-07-16 18:57:16 UTC (rev 17774) +++ pbi/modules/games/whichwayisup/resources/whichwayisup.png2012-07-16 19:03:31 UTC (rev 17775) Property changes on: pbi/modules/games/whichwayisup/resources/whichwayisup.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png </pre> svn-E1R8x85rdljYtjvyW6yDsg< at >public.gmane.org 2012-07-16T19:03:32 [PC-BSD Commits] r17780 - pcbsd-projects/AD_4_PCBSD/nss http://comments.gmane.org/gmane.os.pcbsd.scm/17328 <pre>Author: johnh Date: 2012-07-16 19:26:10 +0000 (Mon, 16 Jul 2012) New Revision: 17780 Removed: pcbsd-projects/AD_4_PCBSD/nss/nsswitch.conf Log: Don't need this in svn. </pre> svn-E1R8x85rdljYtjvyW6yDsg< at >public.gmane.org 2012-07-16T19:26:10 [PC-BSD Commits] r17779 - pcbsd-projects/AD_4_PCBSD/pam http://comments.gmane.org/gmane.os.pcbsd.scm/17327 <pre>Author: johnh Date: 2012-07-16 19:25:46 +0000 (Mon, 16 Jul 2012) New Revision: 17779 Removed: pcbsd-projects/AD_4_PCBSD/pam/sshd Log: Don't need this in svn. </pre> svn-E1R8x85rdljYtjvyW6yDsg< at >public.gmane.org 2012-07-16T19:25:47 [PC-BSD Commits] r17778 - pcbsd-projects/AD_4_PCBSD/krb http://comments.gmane.org/gmane.os.pcbsd.scm/17326 <pre>Author: johnh Date: 2012-07-16 19:25:09 +0000 (Mon, 16 Jul 2012) New Revision: 17778 Removed: pcbsd-projects/AD_4_PCBSD/krb/krb5.conf Log: Don't need this in svn. </pre> svn-E1R8x85rdljYtjvyW6yDsg< at >public.gmane.org 2012-07-16T19:25:09 [PC-BSD Commits] r17777 - in pbi/modules/games: . penguin-commandpenguin-command/resources penguin-command/xdg-desktoppenguin-command/xdg-menu sdl-ball sdl-ball/resourcessdl-ball/xdg-desktop sdl-ball/xdg-menu sdlCC sdlCC/resourcessdlCC/xdg-desktop sdlCC/xdg-menu stransball2stransball2/resources stransball2/xdg-desktop stransball2/xdg-menu http://comments.gmane.org/gmane.os.pcbsd.scm/17325 <pre>Author: kenmoore Date: 2012-07-16 19:24:58 +0000 (Mon, 16 Jul 2012) New Revision: 17777 Added: pbi/modules/games/penguin-command/ pbi/modules/games/penguin-command/external-links pbi/modules/games/penguin-command/pbi.conf pbi/modules/games/penguin-command/resources/ pbi/modules/games/penguin-command/resources/penguin-command.png pbi/modules/games/penguin-command/scripts/ pbi/modules/games/penguin-command/xdg-desktop/ pbi/modules/games/penguin-command/xdg-desktop/penguin-command.desktop pbi/modules/games/penguin-command/xdg-menu/ pbi/modules/games/penguin-command/xdg-menu/penguin-command.desktop pbi/modules/games/penguin-command/xdg-mime/ pbi/modules/games/sdl-ball/ pbi/modules/games/sdl-ball/external-links pbi/modules/games/sdl-ball/pbi.conf pbi/modules/games/sdl-ball/resources/ pbi/modules/games/sdl-ball/resources/icon32.png pbi/modules/games/sdl-ball/scripts/ pbi/modules/games/sdl-ball/xdg-desktop/ pbi/modules/games/sdl-ball/xdg-desktop/sdl-ball.desktop pbi/modules/games/sdl-ball/xdg-menu/ pbi/modules/games/sdl-ball/xdg-menu/sdl-ball.desktop pbi/modules/games/sdl-ball/xdg-mime/ pbi/modules/games/sdlCC/ pbi/modules/games/sdlCC/external-links pbi/modules/games/sdlCC/pbi.conf pbi/modules/games/sdlCC/resources/ pbi/modules/games/sdlCC/resources/CC.png pbi/modules/games/sdlCC/scripts/ pbi/modules/games/sdlCC/xdg-desktop/ pbi/modules/games/sdlCC/xdg-desktop/sdlCC.desktop pbi/modules/games/sdlCC/xdg-menu/ pbi/modules/games/sdlCC/xdg-menu/sdlCC.desktop pbi/modules/games/sdlCC/xdg-mime/ pbi/modules/games/stransball2/ pbi/modules/games/stransball2/external-links pbi/modules/games/stransball2/pbi.conf pbi/modules/games/stransball2/resources/ pbi/modules/games/stransball2/resources/stransball2.png pbi/modules/games/stransball2/scripts/ pbi/modules/games/stransball2/xdg-desktop/ pbi/modules/games/stransball2/xdg-desktop/stransball2.desktop pbi/modules/games/stransball2/xdg-menu/ pbi/modules/games/stransball2/xdg-menu/stransball2.desktop pbi/modules/games/stransball2/xdg-mime/ Log: Add modules for games/[sdlCC, SDL-Ball, stransball2, penguin-command]. Thanks to "nemysis" for the modules Index: pbi/modules/games/penguin-command/resources/penguin-command.png =================================================================== --- pbi/modules/games/penguin-command/resources/penguin-command.png2012-07-16 19:24:42 UTC (rev 17776) +++ pbi/modules/games/penguin-command/resources/penguin-command.png2012-07-16 19:24:58 UTC (rev 17777) Property changes on: pbi/modules/games/penguin-command/resources/penguin-command.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png Index: pbi/modules/games/sdl-ball/resources/icon32.png =================================================================== --- pbi/modules/games/sdl-ball/resources/icon32.png2012-07-16 19:24:42 UTC (rev 17776) +++ pbi/modules/games/sdl-ball/resources/icon32.png2012-07-16 19:24:58 UTC (rev 17777) Property changes on: pbi/modules/games/sdl-ball/resources/icon32.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png Index: pbi/modules/games/sdlCC/pbi.conf =================================================================== --- pbi/modules/games/sdlCC/pbi.conf2012-07-16 19:24:42 UTC (rev 17776) +++ pbi/modules/games/sdlCC/pbi.conf2012-07-16 19:24:58 UTC (rev 17777) Property changes on: pbi/modules/games/sdlCC/pbi.conf ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* Index: pbi/modules/games/sdlCC/resources/CC.png =================================================================== --- pbi/modules/games/sdlCC/resources/CC.png2012-07-16 19:24:42 UTC (rev 17776) +++ pbi/modules/games/sdlCC/resources/CC.png2012-07-16 19:24:58 UTC (rev 17777) Property changes on: pbi/modules/games/sdlCC/resources/CC.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png Index: pbi/modules/games/stransball2/resources/stransball2.png =================================================================== --- pbi/modules/games/stransball2/resources/stransball2.png2012-07-16 19:24:42 UTC (rev 17776) +++ pbi/modules/games/stransball2/resources/stransball2.png2012-07-16 19:24:58 UTC (rev 17777) Property changes on: pbi/modules/games/stransball2/resources/stransball2.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png </pre> svn-E1R8x85rdljYtjvyW6yDsg< at >public.gmane.org 2012-07-16T19:24:58 [PC-BSD Commits] r17776 - pcbsd-projects/AD_4_PCBSD/samba http://comments.gmane.org/gmane.os.pcbsd.scm/17324 <pre>Author: johnh Date: 2012-07-16 19:24:42 +0000 (Mon, 16 Jul 2012) New Revision: 17776 Removed: pcbsd-projects/AD_4_PCBSD/samba/smb.conf pcbsd-projects/AD_4_PCBSD/samba/smb.conf.stock Log: Don't need these in svn. </pre> svn-E1R8x85rdljYtjvyW6yDsg< at >public.gmane.org 2012-07-16T19:24:42 [PC-BSD Commits] r17767 - in pbi/modules: sysutils sysutils/easypbisysutils/gsmartcontrol sysutils/gsmartcontrol/resourcessysutils/gsmartcontrol/xdg-desktopsysutils/gsmartcontrol/xdg-menu www www/w3mirwww/w3mir/resources x11 x11/kgamma x11/kgamma/resourcesx11/kgamma/xdg-desktop x11/kgamma/xdg-menu http://comments.gmane.org/gmane.os.pcbsd.scm/17323 <pre>Author: kenmoore Date: 2012-07-16 16:57:37 +0000 (Mon, 16 Jul 2012) New Revision: 17767 Added: pbi/modules/sysutils/easypbi/external-links pbi/modules/sysutils/gsmartcontrol/ pbi/modules/sysutils/gsmartcontrol/external-links pbi/modules/sysutils/gsmartcontrol/pbi.conf pbi/modules/sysutils/gsmartcontrol/resources/ pbi/modules/sysutils/gsmartcontrol/resources/gsmartcontrol.png pbi/modules/sysutils/gsmartcontrol/scripts/ pbi/modules/sysutils/gsmartcontrol/xdg-desktop/ pbi/modules/sysutils/gsmartcontrol/xdg-desktop/gsmartcontrol-root.desktop pbi/modules/sysutils/gsmartcontrol/xdg-desktop/gsmartcontrol.desktop pbi/modules/sysutils/gsmartcontrol/xdg-menu/ pbi/modules/sysutils/gsmartcontrol/xdg-menu/gsmartcontrol-root.desktop pbi/modules/sysutils/gsmartcontrol/xdg-menu/gsmartcontrol.desktop pbi/modules/sysutils/gsmartcontrol/xdg-mime/ pbi/modules/www/w3mir/ pbi/modules/www/w3mir/external-links pbi/modules/www/w3mir/pbi.conf pbi/modules/www/w3mir/resources/ pbi/modules/www/w3mir/resources/w3mir.png pbi/modules/www/w3mir/scripts/ pbi/modules/www/w3mir/xdg-desktop/ pbi/modules/www/w3mir/xdg-menu/ pbi/modules/www/w3mir/xdg-mime/ pbi/modules/x11/kgamma/ pbi/modules/x11/kgamma/external-links pbi/modules/x11/kgamma/pbi.conf pbi/modules/x11/kgamma/resources/ pbi/modules/x11/kgamma/resources/kgamma.png pbi/modules/x11/kgamma/scripts/ pbi/modules/x11/kgamma/xdg-desktop/ pbi/modules/x11/kgamma/xdg-desktop/xf86gammacfg.desktop pbi/modules/x11/kgamma/xdg-menu/ pbi/modules/x11/kgamma/xdg-menu/xf86gammacfg.desktop pbi/modules/x11/kgamma/xdg-mime/ Log: Add modules for www/w3mir, sysutils/gsmartcontrol, and x11/kgamma. Thanks to "nemysis" for sending them in. Index: pbi/modules/sysutils/gsmartcontrol/pbi.conf =================================================================== --- pbi/modules/sysutils/gsmartcontrol/pbi.conf2012-07-16 16:34:25 UTC (rev 17766) +++ pbi/modules/sysutils/gsmartcontrol/pbi.conf2012-07-16 16:57:37 UTC (rev 17767) Property changes on: pbi/modules/sysutils/gsmartcontrol/pbi.conf ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* Index: pbi/modules/sysutils/gsmartcontrol/resources/gsmartcontrol.png =================================================================== --- pbi/modules/sysutils/gsmartcontrol/resources/gsmartcontrol.png2012-07-16 16:34:25 UTC (rev 17766) +++ pbi/modules/sysutils/gsmartcontrol/resources/gsmartcontrol.png2012-07-16 16:57:37 UTC (rev 17767) Property changes on: pbi/modules/sysutils/gsmartcontrol/resources/gsmartcontrol.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png Index: pbi/modules/www/w3mir/resources/w3mir.png =================================================================== --- pbi/modules/www/w3mir/resources/w3mir.png2012-07-16 16:34:25 UTC (rev 17766) +++ pbi/modules/www/w3mir/resources/w3mir.png2012-07-16 16:57:37 UTC (rev 17767) Property changes on: pbi/modules/www/w3mir/resources/w3mir.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png Index: pbi/modules/x11/kgamma/resources/kgamma.png =================================================================== --- pbi/modules/x11/kgamma/resources/kgamma.png2012-07-16 16:34:25 UTC (rev 17766) +++ pbi/modules/x11/kgamma/resources/kgamma.png2012-07-16 16:57:37 UTC (rev 17767) Property changes on: pbi/modules/x11/kgamma/resources/kgamma.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png </pre> svn-E1R8x85rdljYtjvyW6yDsg< at >public.gmane.org 2012-07-16T16:57:37 [PC-BSD Commits] r17769 - in pbi/modules: astro astro/xplanetastro/xplanet/resources games games/xorgramanagames/xorgramana/resources games/xorgramana/xdg-desktopgames/xorgramana/xdg-menu games/xpilot-ng-servergames/xpilot-ng-server/resources games/xpilot-ng-server/xdg-desktopgames/xpilot-ng-server/xdg-menu games/xpiredgames/xpired/resources games/xpired/xdg-desktopgames/xpired/xdg-menu http://comments.gmane.org/gmane.os.pcbsd.scm/17322 <pre>Author: kenmoore Date: 2012-07-16 17:39:06 +0000 (Mon, 16 Jul 2012) New Revision: 17769 Added: pbi/modules/astro/xplanet/ pbi/modules/astro/xplanet/external-links pbi/modules/astro/xplanet/pbi.conf pbi/modules/astro/xplanet/resources/ pbi/modules/astro/xplanet/resources/xplanet.png pbi/modules/astro/xplanet/scripts/ pbi/modules/astro/xplanet/xdg-desktop/ pbi/modules/astro/xplanet/xdg-menu/ pbi/modules/astro/xplanet/xdg-mime/ pbi/modules/games/xorgramana/ pbi/modules/games/xorgramana/external-links pbi/modules/games/xorgramana/pbi.conf pbi/modules/games/xorgramana/resources/ pbi/modules/games/xorgramana/resources/x.png pbi/modules/games/xorgramana/scripts/ pbi/modules/games/xorgramana/xdg-desktop/ pbi/modules/games/xorgramana/xdg-desktop/xorgramana.desktop pbi/modules/games/xorgramana/xdg-menu/ pbi/modules/games/xorgramana/xdg-menu/xorgramana.desktop pbi/modules/games/xorgramana/xdg-mime/ pbi/modules/games/xpilot-ng-server/ pbi/modules/games/xpilot-ng-server/external-links pbi/modules/games/xpilot-ng-server/pbi.conf pbi/modules/games/xpilot-ng-server/resources/ pbi/modules/games/xpilot-ng-server/resources/xpilot-ng.png pbi/modules/games/xpilot-ng-server/scripts/ pbi/modules/games/xpilot-ng-server/xdg-desktop/ pbi/modules/games/xpilot-ng-server/xdg-desktop/xpilot-ng-sdl.desktop pbi/modules/games/xpilot-ng-server/xdg-desktop/xpilot-ng-server.desktop pbi/modules/games/xpilot-ng-server/xdg-menu/ pbi/modules/games/xpilot-ng-server/xdg-menu/xpilot-ng-sdl.desktop pbi/modules/games/xpilot-ng-server/xdg-menu/xpilot-ng-server.desktop pbi/modules/games/xpilot-ng-server/xdg-mime/ pbi/modules/games/xpired/ pbi/modules/games/xpired/external-links pbi/modules/games/xpired/pbi.conf pbi/modules/games/xpired/resources/ pbi/modules/games/xpired/resources/X-pired.png pbi/modules/games/xpired/scripts/ pbi/modules/games/xpired/xdg-desktop/ pbi/modules/games/xpired/xdg-desktop/xpired.desktop pbi/modules/games/xpired/xdg-desktop/xpiredit.desktop pbi/modules/games/xpired/xdg-menu/ pbi/modules/games/xpired/xdg-menu/xpired.desktop pbi/modules/games/xpired/xdg-menu/xpiredit.desktop pbi/modules/games/xpired/xdg-mime/ Log: Add modules for games/[xorgramana,xpilot-ng-server,xpired] and astro/xplanet. Thanks to "nemysis" for the modules Index: pbi/modules/astro/xplanet/resources/xplanet.png =================================================================== --- pbi/modules/astro/xplanet/resources/xplanet.png2012-07-16 16:57:39 UTC (rev 17768) +++ pbi/modules/astro/xplanet/resources/xplanet.png2012-07-16 17:39:06 UTC (rev 17769) Property changes on: pbi/modules/astro/xplanet/resources/xplanet.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png Index: pbi/modules/games/xorgramana/resources/x.png =================================================================== --- pbi/modules/games/xorgramana/resources/x.png2012-07-16 16:57:39 UTC (rev 17768) +++ pbi/modules/games/xorgramana/resources/x.png2012-07-16 17:39:06 UTC (rev 17769) Property changes on: pbi/modules/games/xorgramana/resources/x.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png Index: pbi/modules/games/xpilot-ng-server/resources/xpilot-ng.png =================================================================== --- pbi/modules/games/xpilot-ng-server/resources/xpilot-ng.png2012-07-16 16:57:39 UTC (rev 17768) +++ pbi/modules/games/xpilot-ng-server/resources/xpilot-ng.png2012-07-16 17:39:06 UTC (rev 17769) Property changes on: pbi/modules/games/xpilot-ng-server/resources/xpilot-ng.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png Index: pbi/modules/games/xpired/pbi.conf =================================================================== --- pbi/modules/games/xpired/pbi.conf2012-07-16 16:57:39 UTC (rev 17768) +++ pbi/modules/games/xpired/pbi.conf2012-07-16 17:39:06 UTC (rev 17769) Property changes on: pbi/modules/games/xpired/pbi.conf ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* Index: pbi/modules/games/xpired/resources/X-pired.png =================================================================== --- pbi/modules/games/xpired/resources/X-pired.png2012-07-16 16:57:39 UTC (rev 17768) +++ pbi/modules/games/xpired/resources/X-pired.png2012-07-16 17:39:06 UTC (rev 17769) Property changes on: pbi/modules/games/xpired/resources/X-pired.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png </pre> svn-E1R8x85rdljYtjvyW6yDsg< at >public.gmane.org 2012-07-16T17:39:06 Search Engine Search the mailing list at Gmane query http://search.gmane.org/?group=$group=gmane.os.pcbsd.scm