Masato Taruishi
taru****@users*****
2005年 2月 10日 (木) 15:59:11 JST
===================================================================
RCS file: plugin/sasl/11sasl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin/sasl/11sasl 2005/01/30 18:11:54 1.4
+++ plugin/sasl/11sasl 2005/02/10 06:59:11 1.5
@@ -25,6 +25,12 @@
SASL_MD5_IN=$(ultrapossum_getconf SASL_MD5_IN "$TEMPLATEDIR/sasl-md5.in")
APPDNMODE=$(ultrapossum_getconf APPDNMODE "SASL/Digest-MD5")
+ SASL_GSSAPI_IN=$(ultrapossum_getconf SASL_GSSAPI_IN "$TEMPLATEDIR/sasl-gssapi.in")
+ KRBCONF=$(ultrapossum_getconf KRBCONF "$sysconfdir/krb5.conf")
+ if test -f "$KRBCONF"; then
+ REALM=$(ultrapossum_getconf REALM "`grep -v \# $KRBCONF | grep default_realm | cut -d= -f2 | tr -d ' ' | head -1`")
+ fi
+
SASLMODULEDIR=$(ultrapossum_getconf SASLMODULEDIR "/usr/lib/sasl2")
fi
===================================================================
RCS file: plugin/sasl/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin/sasl/Makefile.am 2004/09/29 13:51:19 1.4
+++ plugin/sasl/Makefile.am 2005/02/10 06:59:11 1.5
@@ -8,13 +8,14 @@
modulesysconf_DATA = sasl.cf
templatedir = $(sysconfdir)/ultrapossum/in.d
-template_DATA = sasl-md5.in
+template_DATA = sasl-md5.in sasl-gssapi.in
modulelocal_SCRIPTS = sasl-account
EXTRA_DIST = \
update-sasl \
sasl-md5.in \
+ sasl-gssapi.in \
11sasl \
sasl-account \
sasl.cf \
===================================================================
RCS file: plugin/sasl/update-sasl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin/sasl/update-sasl 2004/10/11 15:53:42 1.5
+++ plugin/sasl/update-sasl 2005/02/10 06:59:11 1.6
@@ -23,11 +23,12 @@
tmp=`tempfile`
trap "/bin/rm -f $tmp; eval `ultrapossum-config term`" 0
+id="SASL"
+
configure() {
- echo -n "Configuring SASL/Digest-MD5... " 1>&2
+ progress "Configuring SASL/Digest-MD5... "
+ add_startmark "##" $id > $tmp
if test -f "$SASL_MD5_IN"; then
- id="SASL"
- add_startmark "##" $id > $tmp
SYNCRDN="`echo $SYNCDN | cut -d, -f1 | cut -d= -f2`"
ROOT="`echo $ROOTDN | cut -d, -f1 | cut -d= -f2`"
sed -e "s/#SUFFIX#/$SUFFIX/" \
@@ -37,10 +38,15 @@
-e "s/#PACKAGE#/$PACKAGE/" \
-e "s/#SYNCDN#/$SYNCDN/" -e "s/#SYNCRDN#/$SYNCRDN/" \
< $SASL_MD5_IN >> $tmp
- add_endmark "##" $id >> $tmp
- add_vaconf $SLAPDCONF $tmp $id
fi
- echo "done" 1>&2
+ progress "Configuring SASL/Digest-MD5... done"
+ if test "x$REALM" != "x"; then
+ progress "Configuring SASL/GSSAPI... "
+ $SHAREDIR/sedwrap < $SASL_GSSAPI_IN >> $tmp
+ progress "Configuring SASL/GSSAPI... done"
+ fi
+ add_endmark "##" $id >> $tmp
+ add_vaconf $SLAPDCONF $tmp $id
$MODULEDIR/sasl/sasl-account
}