From taru ¡÷ users.sourceforge.jp  Mon Sep  6 16:22:13 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Mon, 6 Sep 2004 16:22:13 +0900
Subject: [Ultrapossum-cvs 353] demo/uml/debian 1.7,1.8,config 1.2,1.3,rules
Message-ID: <20040906072213.A0ABF2AC010@users.sourceforge.jp>

===================================================================
RCS file: demo/uml/debian/config,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- demo/uml/debian/config	2004/07/27 05:41:49	1.7
+++ demo/uml/debian/config	2004/09/06 07:22:13	1.8
@@ -62,7 +62,7 @@
 
 db_get ultrapossum-uml/uml_mirror_candidates
 if test "x$RET" = "xmisc"; then
-  db_input medium ultrapossum-uml/uml_mirror
+  db_input medium ultrapossum-uml/uml_mirror || true
   db_go
 else
   db_set ultrapossum-uml/uml_mirror "$RET"
===================================================================
RCS file: demo/uml/debian/rules,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- demo/uml/debian/rules	2004/07/03 15:40:08	1.2
+++ demo/uml/debian/rules	2004/09/06 07:22:13	1.3
@@ -9,6 +9,8 @@
 VERSION := $(shell dpkg-parsechangelog | grep Version | cut -d' ' -f2)
 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
+DEB_DH_INSTALLINIT_ARGS := -- defaults 18
+
 common-binary-post-install-indep::
 	install -d $(DEB_DESTDIR)/etc/devfs/conf.d/
 	install -m644 debian/devfs.conf $(DEB_DESTDIR)/etc/devfs/conf.d/ultrapossum-uml


From taru ¡÷ users.sourceforge.jp  Mon Sep  6 17:34:23 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Mon, 6 Sep 2004 17:34:23 +0900
Subject: [Ultrapossum-cvs 354] ultrapossum/debian 1.41,1.42,changelog
Message-ID: <20040906083423.50C052AC010@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/changelog,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ultrapossum/debian/changelog	2004/07/22 07:57:45	1.41
+++ ultrapossum/debian/changelog	2004/09/06 08:34:23	1.42
@@ -1,3 +1,9 @@
+ultrapossum (0.1beta7-0pre5) unstable; urgency=low
+
+  * Applied the latest upstream version.
+
+ -- Masato Taruishi <taru ¡÷ valinux.co.jp>  Mon,  6 Sep 2004 17:32:41 +0900
+
 ultrapossum (0.1beta7-0pre4) unstable; urgency=low
 
   * Applied the latest upstream version.


From taru ¡÷ users.sourceforge.jp  Mon Sep  6 20:10:30 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Mon, 6 Sep 2004 20:10:30 +0900
Subject: [Ultrapossum-cvs 355] ultrapossum/module/server 1.6,1.7,slapd.sh
Message-ID: <20040906111030.3EF812AC018@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/server/slapd.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ultrapossum/module/server/slapd.sh	2004/05/19 16:32:23	1.6
+++ ultrapossum/module/server/slapd.sh	2004/09/06 11:10:30	1.7
@@ -99,7 +99,7 @@
     for slave in $SYNCBACKUPS
     do
       if test "x$HOST" != "x$slave"; then
-        echo "replica host=$slave"
+        echo "replica host=$slave:$REPLICALISTENPORT"
         echo "	binddn=\"$UPDATEDN\""
         echo "	syncid=$slave"
         echo "	bindmethod=simple"


From taru ¡÷ users.sourceforge.jp  Tue Sep  7 18:28:00 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 7 Sep 2004 18:28:00 +0900
Subject: [Ultrapossum-cvs 356] plugin/slapd/debian/upstream 1.1, 1.2,
	syncbackup-2.2.14.patch
Message-ID: <20040907092800.218202AC01D@users.sourceforge.jp>

===================================================================
RCS file: plugin/slapd/debian/upstream/syncbackup-2.2.14.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin/slapd/debian/upstream/syncbackup-2.2.14.patch	2004/08/27 09:26:05	1.1
+++ plugin/slapd/debian/upstream/syncbackup-2.2.14.patch	2004/09/07 09:28:00	1.2
@@ -643,7 +643,7 @@
 +	}
 +	si->si_bindmethod = LDAP_AUTH_SIMPLE;
 +        si->si_schemachecking = 0;
-+	ber_str2bv( "(objectclass=*)", sizeof("(objectclass=*)")-1, 0,
++	ber_str2bv( "(objectclass=*)", sizeof("(objectclass=*)")-1, 1,
 +		&si->si_filterstr );
 +	if ( be->be_suffix && be->be_suffix[0].bv_val ) {
 +		ber_dupbv( &si->si_base, &be->be_suffix[0] );


From taru ¡÷ users.sourceforge.jp  Tue Sep  7 19:30:45 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 7 Sep 2004 19:30:45 +0900
Subject: [Ultrapossum-cvs 357] ultrapossum 1.43, 1.44, modules.in 1.15, 1.16,
	update-ultrapossum
Message-ID: <20040907103045.65E8C2AC014@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/modules.in,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ultrapossum/modules.in	2004/07/13 08:25:07	1.43
+++ ultrapossum/modules.in	2004/09/07 10:30:45	1.44
@@ -382,13 +382,13 @@
     for f in `find $APPSCONFDIR -name '*.cf'`
     do
       if test -f $f; then
-        ULTRAPOSSUMCF="$ULTRAPOSSUMCF $f"
+        cfs="$cfs $f"
       fi
     done
     for f in `find $APPSCONFDIR -name "*.cf$EXTRACONFSUFFIX"`
     do
       if test -f $f; then
-        ULTRAPOSSUMCF="$ULTRAPOSSUMCF $f"
+        cfs="$cfs $f"
       fi
     done
   fi
@@ -402,8 +402,8 @@
     . $SYSCONFDIR/projects/$ULTRAPOSSUM_PROJECT$EXTRACONFSUFFIX
   fi
 
-  if test "x$ULTRAPOSSUMCF" != "x"; then
-    for cf in $ULTRAPOSSUMCF
+  if test "x$cfs" != "x"; then
+    for cf in $cfs
     do
       if test -f "$cf"; then
         if test -r "$cf"; then
===================================================================
RCS file: ultrapossum/update-ultrapossum,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ultrapossum/update-ultrapossum	2004/07/03 06:58:21	1.15
+++ ultrapossum/update-ultrapossum	2004/09/07 10:30:45	1.16
@@ -55,6 +55,7 @@
 
 up_to_date() {
   if ! test -f "$CONFSTATUS"; then
+    echo "status change detected" 1>&2
     return 1
   fi
   if test "$SLAPDCONF" -nt "$CONFSTATUS"; then
@@ -74,10 +75,10 @@
 configure() {
   conftemp=`tempfile`
   chmod 640 $conftemp
-  getconfig | grep -v SLAPROOTPW > $conftemp
+  getconfig | grep -v SLAPROOTPW | grep -v CHROOTFILES > $conftemp
   # little evil
   if ! up_to_date ||
-  	! test -f "$CONFSTATUS" || ! diff $CONFSTATUS $conftemp > /dev/null
+  	diff -u $CONFSTATUS $conftemp | egrep "^\+[^+]" | cut -d+ -f2 | cut -d= -f1 | egrep . 1>&2
   then
     sanity_module
 


From taru ¡÷ users.sourceforge.jp  Tue Sep  7 19:30:45 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 7 Sep 2004 19:30:45 +0900
Subject: [Ultrapossum-cvs 358] ultrapossum/module/server ...
Message-ID: <20040907103045.8FF452AC01D@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/server/createdb.sh,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ultrapossum/module/server/createdb.sh	2004/07/08 09:47:37	1.23
+++ ultrapossum/module/server/createdb.sh	2004/09/07 10:30:45	1.24
@@ -110,6 +110,10 @@
  fi
 fi
 
+if test "x$HOST" = "x$MASTER" && include "$HOST" "$SYNCBACKUPS"; then
+  SLAPADD_EXTRA_ARGS="$SLAPADD_EXTRA_ARGS -p -w"
+fi
+
 echo -n "Creating Initial Directory in $CHROOTDIRECTORY$DIRECTORY... " 1>&2
 if $SLAPADD -b $SUFFIX -f $SLAPDCONF $SLAPADD_EXTRA_ARGS < $ldiffile; then
   echo "done" 1>&2
@@ -121,6 +125,9 @@
 
 for l in $extraldifs
 do
+  if test "x$HOST" = "x$MASTER" && include "$HOST" "$SYNCBACKUPS"; then
+    sleep 1 # ad-hoc? slapadd must be run in 1 seconds for contextCSN
+  fi
   echo -n "Setting up `basename $l .ldif` entries... " 1>&2
   if $SLAPADD -b $SUFFIX -f $SLAPDCONF $SLAPADD_EXTRA_ARGS < $l; then
     echo "done" 1>&2
===================================================================
RCS file: ultrapossum/module/server/sshman,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ultrapossum/module/server/sshman	2004/07/22 07:56:43	1.6
+++ ultrapossum/module/server/sshman	2004/09/07 10:30:45	1.7
@@ -31,7 +31,9 @@
 }
 
 unauth() {
-  strip_vaconf $HOME/.ssh/authorized_keys "SERVER"
+  if test -f $HOME/.ssh/authorized_keys; then
+    strip_vaconf $HOME/.ssh/authorized_keys "SERVER"
+  fi
 }
 
 # cmd <host> <cmd>
===================================================================
RCS file: ultrapossum/module/server/update-server,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ultrapossum/module/server/update-server	2004/07/03 06:11:45	1.47
+++ ultrapossum/module/server/update-server	2004/09/07 10:30:45	1.48
@@ -134,6 +134,7 @@
 
   if ! test -e "$DIRECTORY"; then
       $MODULEDIR/server/createdb.sh
+      create_environ # To save ULTRAPOSSUM_INDEX
   else
     index_old=`getvalue $DIRECTORY/ultrapossum-environ ULTRAPOSSUM_INDEX`
     if test "x$ULTRAPOSSUM_INDEX" != "x$index_old"; then


From taru ¡÷ users.sourceforge.jp  Tue Sep  7 19:31:06 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 7 Sep 2004 19:31:06 +0900
Subject: [Ultrapossum-cvs 359] ultrapossum/debian 1.42,1.43,changelog
Message-ID: <20040907103106.4AFB02AC014@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/changelog,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ultrapossum/debian/changelog	2004/09/06 08:34:23	1.42
+++ ultrapossum/debian/changelog	2004/09/07 10:31:06	1.43
@@ -1,3 +1,10 @@
+ultrapossum (0.1beta7-0pre6) unstable; urgency=low
+
+  * Applied the latest upstream version.
+     - syncbackup support
+
+ -- Masato Taruishi <taru ¡÷ valinux.co.jp>  Tue,  7 Sep 2004 19:29:21 +0900
+
 ultrapossum (0.1beta7-0pre5) unstable; urgency=low
 
   * Applied the latest upstream version.


From taru ¡÷ users.sourceforge.jp  Tue Sep  7 21:17:13 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 7 Sep 2004 21:17:13 +0900
Subject: [Ultrapossum-cvs 360] ultrapossum/debian ...
Message-ID: <20040907121713.BA9162AC014@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/control,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ultrapossum/debian/control	2004/08/24 00:35:11	1.16
+++ ultrapossum/debian/control	2004/09/07 12:17:13	1.17
@@ -33,7 +33,7 @@
 
 Package: ultrapossum-server
 Architecture: all
-Depends: ultrapossum-slapd | slapd, ultrapossum-common (= ${Source-Version}), ssh, binutils, ldap-utils, makepasswd, ucf, ${misc:Depends}, ${perl:Depends}
+Depends: ultrapossum-slapd | slapd, ultrapossum-common (>= ${Source-Version}), ssh, binutils, ldap-utils, makepasswd, ucf, ${misc:Depends}, ${perl:Depends}
 Suggests: ultrapossum-failover, dlocate
 Description: ULtraPossum LDAP server
  This package consists of the UltraPossum LDAP Server core scripts.
===================================================================
RCS file: ultrapossum/debian/ultrapossum-server.config,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ultrapossum/debian/ultrapossum-server.config	2004/07/03 11:26:08	1.19
+++ ultrapossum/debian/ultrapossum-server.config	2004/09/07 12:17:13	1.20
@@ -12,10 +12,12 @@
 trap "/bin/rm -f $tmp" 0
 chmod 600 $tmp
 
-if test "$1" = "reconfigure"; then
-
+if test -f "/usr/share/ultrapossum/module.d/10server"; then
   eval `/usr/bin/ultrapossum-config init`
   trap "/bin/rm -f $tmp; eval `ultrapossum-config term`" 0
+fi
+
+if test "$1" = "reconfigure"; then
 
   # special care for passwd
   ROOTPW=""
@@ -25,8 +27,9 @@
   fi
 
 else
-  MASTER=`hostname`
-  DBDIRECTORY="/var/lib/ultrapossum/db"
+
+  MASTER=${MASTER:-`hostname`}
+  DBDIRECTORY=${DBDIRECTORY:-"/var/lib/ultrapossum/db"}
   if test -f "/etc/ultrapossum/ultrapossum.cf"; then
     . /etc/ultrapossum/ultrapossum.cf
   fi
@@ -55,7 +58,7 @@
 db_set ultrapossum-server/rootpw2 "$ROOTPW"
 
 if test "x$MASTER" = "x" || test "x$MASTER" = "x`hostname`"; then
-  if test "x$SLAVES" = "x"; then
+  if test "x$SLURPDSLAVES" = "x"; then
     db_set ultrapossum-server/type standalone
   else
     db_set ultrapossum-server/type master
@@ -230,7 +233,7 @@
       fi
     else
       db_set ultrapossum-server/master $MASTER
-      db_set ultrapossum-server/slaves $SLAVES
+      db_set ultrapossum-server/slaves $SLURPDSLAVES
       STATE=SUFFIX
     fi
   ;;


From taru ¡÷ users.sourceforge.jp  Tue Sep  7 21:17:13 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 7 Sep 2004 21:17:13 +0900
Subject: [Ultrapossum-cvs 361] ultrapossum/module/server 1.7,1.8,slapd.sh
Message-ID: <20040907121713.CCAE92AC024@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/server/slapd.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ultrapossum/module/server/slapd.sh	2004/09/06 11:10:30	1.7
+++ ultrapossum/module/server/slapd.sh	2004/09/07 12:17:13	1.8
@@ -28,7 +28,7 @@
 
   INDEXES_EQ="objectClass"
   if test "x$SLAPD_PROVIDES_SYNCBACKUP" != "x"; then
-    INDEXES_EQ="$INDEXES_EQ,contextCSN,entryUUID"
+    INDEXES_EQ="$INDEXES_EQ,contextCSN,entryUUID,structuralObjectClass,entryCSN"
   fi
   ## FIXME: handle database specific grammer?
   ## TODO: choose apps


From taru ¡÷ users.sourceforge.jp  Tue Sep  7 21:17:50 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 7 Sep 2004 21:17:50 +0900
Subject: [Ultrapossum-cvs 362] ultrapossum/debian 1.43,1.44,changelog
Message-ID: <20040907121750.F26872AC014@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/changelog,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ultrapossum/debian/changelog	2004/09/07 10:31:06	1.43
+++ ultrapossum/debian/changelog	2004/09/07 12:17:50	1.44
@@ -1,3 +1,10 @@
+ultrapossum (0.1beta7-0pre6.1) unstable; urgency=low
+
+  * Applied the latest upstream version.
+     - syncbackup fixes
+
+ -- Masato Taruishi <taru ¡÷ valinux.co.jp>  Tue,  7 Sep 2004 21:15:56 +0900
+
 ultrapossum (0.1beta7-0pre6) unstable; urgency=low
 
   * Applied the latest upstream version.


From taru ¡÷ users.sourceforge.jp  Wed Sep  8 13:25:41 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 8 Sep 2004 13:25:41 +0900
Subject: [Ultrapossum-cvs 363] plugin/debug NONE,1.1,attach
Message-ID: <20040908042541.BBBF32AC028@users.sourceforge.jp>



From taru ¡÷ users.sourceforge.jp  Wed Sep  8 15:09:44 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 8 Sep 2004 15:09:44 +0900
Subject: [Ultrapossum-cvs 364] plugin/debug 1.1,1.2,attach
Message-ID: <20040908060944.740162AC025@users.sourceforge.jp>

===================================================================
RCS file: plugin/debug/attach,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin/debug/attach	2004/09/08 04:25:41	1.1
+++ plugin/debug/attach	2004/09/08 06:09:44	1.2
@@ -5,6 +5,8 @@
 eval `ultrapossum-config init`
 trap "`eval ultrapossum-config term`" 0
 
+DEBUGGER=${DEBUGGER:-gdb}
+
 get_pid() {
   ( for p in $@
   do
@@ -23,22 +25,28 @@
 }
 
 attach_process() {
+  if test "x$1" = "x"; then
+    echo "Can't detect which program to be run" 1>&2
+    return 1
+  fi
   if test "x$2" = "x"; then
     echo "No process found for $1" 1>&2
   else
-    gdb "$1" "$2"
+    $DEBUGGER "$1" "$2"
   fi
 }
 
 case "x$1" in
   xslapd)
     pid=`slapd_pid`
-    attach_process $SLAPD $pid
+    SLAPD=`getvalue $ULTRAPOSSUMRUN SLAPD 2> /dev/null`
+    attach_process "$SLAPD" $pid
   ;;
 
   xslurpd)
     pid=`slurpd_pid`
-    attach_process $SLURPD $pid
+    SLURPD=`getvalue $ULTRAPOSSUMRUN SLURPD 2> /dev/null`
+    attach_process "$SLURPD" $pid
   ;;
 
   x)


From taru ¡÷ users.sourceforge.jp  Thu Sep  9 00:25:15 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 9 Sep 2004 00:25:15 +0900
Subject: [Ultrapossum-cvs 365] demo/uml 1.13,1.14,update-uml
Message-ID: <20040908152515.8EDC22AC00F@users.sourceforge.jp>

===================================================================
RCS file: demo/uml/update-uml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- demo/uml/update-uml	2004/07/27 04:09:53	1.13
+++ demo/uml/update-uml	2004/09/08 15:25:15	1.14
@@ -66,6 +66,7 @@
 # ad-hoc?
 adjustconfig() {
   ultrapossum_setconf_shell "$UMLDIR/etc/module.d/server.cf" MASTER "$HOST"
+  ultrapossum_setconf_shell "$UMLDIR/etc/ultrapossum.cf" LDAPMASTER "$HOST"
 }
 
 # getip <hostname>


From taru ¡÷ users.sourceforge.jp  Thu Sep  9 00:25:15 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 9 Sep 2004 00:25:15 +0900
Subject: [Ultrapossum-cvs 366] demo/uml/debian 1.8,1.9,config
Message-ID: <20040908152515.A692E2AC033@users.sourceforge.jp>

===================================================================
RCS file: demo/uml/debian/config,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- demo/uml/debian/config	2004/09/06 07:22:13	1.8
+++ demo/uml/debian/config	2004/09/08 15:25:15	1.9
@@ -22,6 +22,14 @@
     uml_hosts="$uml_hosts, $h"
   done
 fi
+if test "x$SYNCBACKUPS" != "x"; then
+  for h in $SYNCBACKUPS
+  do
+    if test "x$h" != "x$MASTER"; then
+      uml_hosts="$uml_hosts, $h"
+    fi
+  done
+fi
 
 uml_mirror_candidates=$(egrep  "^deb[[:space:]]+(http|ftp)://[^[:space:]]+[[:space:]]+[^[:space:]]+[[:space:]]+" /etc/apt/sources.list | sed -e 's/^deb[ ]*\([^ ]*\).*/\1/g' | tr '\n' '#' | sed 's/#/, /g')
 


From taru ¡÷ users.sourceforge.jp  Thu Sep  9 21:27:53 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 9 Sep 2004 21:27:53 +0900
Subject: [Ultrapossum-cvs 367] demo/haviewer 1.3, 1.4, haviewer.glade 1.19,
	1.20, haviewer.rb
Message-ID: <20040909122753.ADCDF2AC068@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/haviewer.glade,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- demo/haviewer/haviewer.glade	2004/06/22 15:21:26	1.3
+++ demo/haviewer/haviewer.glade	2004/09/09 12:27:53	1.4
@@ -12,6 +12,11 @@
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="has_separator">True</property>
 
   <child internal-child="vbox">
@@ -33,6 +38,7 @@
 	      <property name="label">gtk-close</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-7</property>
 	      <signal name="clicked" handler="on_close_clicked" last_modification_time="Thu, 17 Jun 2004 15:13:45 GMT"/>
 	    </widget>
@@ -128,189 +134,397 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkVBox" id="vbox3">
+	    <widget class="GtkNotebook" id="notebook1">
 	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
+	      <property name="can_focus">True</property>
+	      <property name="show_tabs">True</property>
+	      <property name="show_border">True</property>
+	      <property name="tab_pos">GTK_POS_TOP</property>
+	      <property name="scrollable">False</property>
+	      <property name="enable_popup">False</property>
 
 	      <child>
-		<widget class="GtkFrame" id="frame1">
+		<widget class="GtkVBox" id="vbox3">
 		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">0</property>
 
 		  <child>
-		    <widget class="GtkHBox" id="hbox3">
-		      <property name="border_width">4</property>
+		    <widget class="GtkFrame" id="frame1">
 		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
+		      <property name="label_xalign">0</property>
+		      <property name="label_yalign">0.5</property>
+		      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
 
 		      <child>
-			<widget class="GtkHBox" id="hbox4">
+			<widget class="GtkHBox" id="hbox3">
+			  <property name="border_width">4</property>
 			  <property name="visible">True</property>
 			  <property name="homogeneous">False</property>
 			  <property name="spacing">0</property>
 
 			  <child>
-			    <widget class="GtkLabel" id="label3">
+			    <widget class="GtkHBox" id="hbox4">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Master:</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">8</property>
-			      <property name="ypad">0</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">0</property>
+
+			      <child>
+				<widget class="GtkLabel" id="label3">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Master:</property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">8</property>
+				  <property name="ypad">0</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkLabel" id="master_icon">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">OOO</property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">True</property>
+				</packing>
+			      </child>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
 			    </packing>
 			  </child>
 
 			  <child>
-			    <widget class="GtkLabel" id="master_icon">
+			    <widget class="GtkHBox" id="hbox5">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">OOO</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">0</property>
+
+			      <child>
+				<widget class="GtkLabel" id="label6">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Slave:</property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">8</property>
+				  <property name="ypad">0</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkLabel" id="slave_icon">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">OOO</property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">True</property>
+				</packing>
+			      </child>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
-			      <property name="expand">False</property>
+			      <property name="expand">True</property>
 			      <property name="fill">True</property>
 			    </packing>
 			  </child>
 			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="label2">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Status Summary</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
 			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
+			  <property name="type">label_item</property>
 			</packing>
 		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkScrolledWindow" id="scrolledwindow1">
+		      <property name="border_width">4</property>
+		      <property name="width_request">408</property>
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+		      <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+		      <property name="shadow_type">GTK_SHADOW_NONE</property>
+		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
 		      <child>
-			<widget class="GtkHBox" id="hbox5">
+			<widget class="GtkTreeView" id="treeview1">
 			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">0</property>
+			  <property name="can_focus">True</property>
+			  <property name="headers_visible">True</property>
+			  <property name="rules_hint">False</property>
+			  <property name="reorderable">False</property>
+			  <property name="enable_search">True</property>
+			</widget>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="tab_expand">False</property>
+		  <property name="tab_fill">True</property>
+		</packing>
+	      </child>
 
-			  <child>
-			    <widget class="GtkLabel" id="label6">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Slave:</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">8</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
+	      <child>
+		<widget class="GtkLabel" id="label6">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">Activity</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		</widget>
+		<packing>
+		  <property name="type">tab</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkVBox" id="vbox4">
+		  <property name="border_width">4</property>
+		  <property name="visible">True</property>
+		  <property name="sensitive">False</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">0</property>
+
+		  <child>
+		    <widget class="GtkFrame" id="frame2">
+		      <property name="visible">True</property>
+		      <property name="label_xalign">0</property>
+		      <property name="label_yalign">0.5</property>
+		      <property name="shadow_type">GTK_SHADOW_NONE</property>
+
+		      <child>
+			<widget class="GtkAlignment" id="alignment1">
+			  <property name="visible">True</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xscale">1</property>
+			  <property name="yscale">1</property>
+			  <property name="top_padding">0</property>
+			  <property name="bottom_padding">0</property>
+			  <property name="left_padding">12</property>
+			  <property name="right_padding">0</property>
 
 			  <child>
-			    <widget class="GtkLabel" id="slave_icon">
+			    <widget class="GtkHBox" id="hbox6">
+			      <property name="border_width">4</property>
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">OOO</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">8</property>
+
+			      <child>
+				<widget class="GtkLabel" id="label9">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">entry</property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkEntry" id="entry1">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="editable">True</property>
+				  <property name="visibility">True</property>
+				  <property name="max_length">0</property>
+				  <property name="text" translatable="yes">cn=test,o=ultrapossum</property>
+				  <property name="has_frame">True</property>
+				  <property name="invisible_char" translatable="yes">*</property>
+				  <property name="activates_default">False</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">True</property>
+				  <property name="fill">True</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkButton" id="button1">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="label" translatable="yes">Test</property>
+				  <property name="use_underline">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
 			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">True</property>
-			    </packing>
 			  </child>
 			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="label8">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Directory Modification Test</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">True</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
 			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
+			  <property name="type">label_item</property>
 			</packing>
 		      </child>
 		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
 		  </child>
 
 		  <child>
-		    <widget class="GtkLabel" id="label2">
+		    <widget class="GtkScrolledWindow" id="scrolledwindow2">
+		      <property name="border_width">4</property>
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Status Summary</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
+		      <property name="can_focus">True</property>
+		      <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+		      <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+		      <property name="shadow_type">GTK_SHADOW_NONE</property>
+		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+		      <child>
+			<widget class="GtkTreeView" id="treeview2">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="headers_visible">True</property>
+			  <property name="rules_hint">False</property>
+			  <property name="reorderable">False</property>
+			  <property name="enable_search">True</property>
+			</widget>
+		      </child>
 		    </widget>
 		    <packing>
-		      <property name="type">label_item</property>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
 		    </packing>
 		  </child>
 		</widget>
 		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
+		  <property name="tab_expand">False</property>
+		  <property name="tab_fill">True</property>
 		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkScrolledWindow" id="scrolledwindow1">
-		  <property name="border_width">4</property>
-		  <property name="width_request">408</property>
+		<widget class="GtkLabel" id="label7">
 		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-		  <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-		  <property name="shadow_type">GTK_SHADOW_NONE</property>
-		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-		  <child>
-		    <widget class="GtkTreeView" id="treeview1">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="headers_visible">True</property>
-		      <property name="rules_hint">False</property>
-		      <property name="reorderable">False</property>
-		      <property name="enable_search">True</property>
-		    </widget>
-		  </child>
+		  <property name="label" translatable="yes">Test</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
 		</widget>
 		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
+		  <property name="type">tab</property>
 		</packing>
 	      </child>
 	    </widget>
===================================================================
RCS file: demo/haviewer/haviewer.rb,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- demo/haviewer/haviewer.rb	2004/07/21 08:18:36	1.19
+++ demo/haviewer/haviewer.rb	2004/09/09 12:27:53	1.20
@@ -155,13 +155,23 @@
 
   end
 
-  module View
+  class View
 
-    class UltraPossum
+    def initialize(haview)
+      @haview = haview
+      @glade = haview.glade
+    end
+
+    def update(host)
+      @haview.update
+    end
+
+    class UltraPossum < View
     
       Column = ["S", "Host", "Type", "Status", "Pid", "Since" ]
 
       def initialize(haview)
+        super
         @list = Gtk::ListStore.new( String, String, String, String, String, String)
         @columns = []
         Column.size.times do |i|
@@ -177,7 +187,12 @@
 	  @row[h] = @list.append
           Hosts << h
         end
-	@haview = haview
+        @master_icon = Signal::SignalFactory.create
+        @slave_icon = Signal::SignalFactory.create
+        columns.each do |val|
+          @glade["treeview1"].append_column(val)
+        end
+        @glade["treeview1"].set_model(list)
       end
 
       def update(host)
@@ -187,6 +202,7 @@
         @list.set_value(@row[host], 3, host.status)
         @list.set_value(@row[host], 4, host.pid)
         @list.set_value(@row[host], 5, host.since)
+	summary
 	@haview.update
       end
 
@@ -220,64 +236,74 @@
 	    end
           end
         end
-	return { "Master" => master, "Slave" => slave }
+        @master_icon.on(master)
+        @slave_icon.on(slave)
+        @glade["master_icon"].set_markup(@master_icon.to_s)
+        @glade["slave_icon"].set_markup(@slave_icon.to_s)
       end
-
+  
       attr_reader :list, :columns
 
     end
 
+    class UltraPossumTest < View
+
+     Column = ["S", "Host", "Type", "Status" ]
+
+      def initialize(haview)
+        super
+        @list = Gtk::ListStore.new( String, String, String, String )
+        @columns = []
+        Column.size.times do |i|
+          @columns << Gtk::TreeViewColumn.new(Column[i], Gtk::CellRendererText.new, { :markup => i })
+        end
+        @columns.each do |val|
+          @glade["treeview2"].append_column(val)
+        end
+        @glade["treeview2"].set_model(@list)
+      end
+
+    end
+
+
   end
 
 
   def initialize(glade)
     @glade = @glade = GladeXML.new(glade) {|handler| method(handler)}
-    @treeview = @glade["treeview1"]
-    @master_icon = Signal::SignalFactory.create
-    @slave_icon = Signal::SignalFactory.create
-    @view = nil
+    @views = []
     update
   end
 
-  def set_view(view)
-    view.columns.each do |val|
-      @treeview.append_column(val)
-    end
-    @treeview.set_model(view.list)
-    @view = view
+  def add_view(view)
+    @views << view
   end
 
   def update
     @glade["time"].set_text(`date | iconv --to UTF-8`.chomp!)
     @glade["uptime"].set_text(`uptime`.chomp!)
-#    @view.update if @view
-    summary
-  end
-
-  def summary
-    s = {}
-    s = @view.summary if @view
-    @master_icon.on(s["Master"])
-    @slave_icon.on(s["Slave"])
-    @glade["master_icon"].set_markup(@master_icon.to_s)
-    @glade["slave_icon"].set_markup(@slave_icon.to_s)
   end
 
-  attr_reader :view
+  attr_reader :views, :canvas, :glade
 
 end
 
 Gtk.init
 
 haview = HAViewer.new('haviewer.glade')
-haview.set_view( HAViewer::View::UltraPossum.new(haview) )
+haview.add_view( HAViewer::View::UltraPossum.new(haview) )
+haview.add_view( HAViewer::View::UltraPossumTest.new(haview) )
 haview.update
 HAViewer::Hosts.each do |host|
-  haview.view.update(host)
+  haview.views.each do |view|
+    view.update(host)
+  end
   Thread.new {
     while(1) do
       host.snmp
-      haview.view.update(host)
+      haview.views.each do |view|
+        view.update(host)
+      end
       sleep 10
     end
   }


From taru ¡÷ users.sourceforge.jp  Thu Sep  9 21:36:53 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 9 Sep 2004 21:36:53 +0900
Subject: [Ultrapossum-cvs 368] demo/haviewer 1.20,1.21,haviewer.rb
Message-ID: <20040909123653.09E172AC068@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/haviewer.rb,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- demo/haviewer/haviewer.rb	2004/09/09 12:27:53	1.20
+++ demo/haviewer/haviewer.rb	2004/09/09 12:36:52	1.21
@@ -163,7 +163,6 @@
     end
 
     def update(host)
-      @haview.update
     end
 
     class UltraPossum < View
@@ -177,13 +176,13 @@
         Column.size.times do |i|
           @columns << Gtk::TreeViewColumn.new(Column[i], Gtk::CellRendererText.new, { :markup => i })
         end
-        h = Host.new(`ultrapossum-config get MASTER`.gsub!(/MASTER="(.+)"\n/, '\1'), "master" )
-	@row = {} 
-	@row[h] = @list.append
-        Hosts << h
+	 @row = {} 
+#        h = Host.new(`ultrapossum-config get MASTER`.gsub!(/MASTER="(.+)"\n/, '\1'), "master" )
+#	@row[h] = @list.append
+#        Hosts << h
         backup = `ultrapossum-config get BACKUP`.gsub!(/BACKUP="(.+)"\n/, '\1')
         `ultrapossum-config get SLAVES`.gsub!(/SLAVES="(.*)"\n/, '\1').split(' ').each do |s|
-          h = Host.new(s.chomp, (backup==s)?"master":"slave" )
+          h = Host.new(s.chomp, "master" ) # (backup==s)?"master":"slave" )
 	  @row[h] = @list.append
           Hosts << h
         end
@@ -203,7 +202,6 @@
         @list.set_value(@row[host], 4, host.pid)
         @list.set_value(@row[host], 5, host.since)
 	summary
-	@haview.update
       end
 
       def summary
@@ -303,8 +301,9 @@
       host.snmp
       haview.views.each do |view|
         view.update(host)
+	haview.update
       end
-      sleep 10
+      sleep 5
     end
   }
 end


From taru ¡÷ users.sourceforge.jp  Thu Sep  9 21:40:55 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 9 Sep 2004 21:40:55 +0900
Subject: [Ultrapossum-cvs 369] demo/haviewer 1.4,1.5,haviewer.glade
Message-ID: <20040909124055.DEE782AC04F@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/haviewer.glade,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- demo/haviewer/haviewer.glade	2004/09/09 12:27:53	1.4
+++ demo/haviewer/haviewer.glade	2004/09/09 12:40:55	1.5
@@ -392,7 +392,7 @@
 			      <child>
 				<widget class="GtkLabel" id="label9">
 				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">entry</property>
+				  <property name="label" translatable="yes">Test entry</property>
 				  <property name="use_underline">False</property>
 				  <property name="use_markup">False</property>
 				  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -430,13 +430,43 @@
 			      </child>
 
 			      <child>
-				<widget class="GtkButton" id="button1">
+				<widget class="GtkHBox" id="hbox7">
+				  <property name="border_width">4</property>
 				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Test</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
+				  <property name="homogeneous">True</property>
+				  <property name="spacing">4</property>
+
+				  <child>
+				    <widget class="GtkButton" id="button1">
+				      <property name="visible">True</property>
+				      <property name="can_focus">True</property>
+				      <property name="label">gtk-add</property>
+				      <property name="use_stock">True</property>
+				      <property name="relief">GTK_RELIEF_NORMAL</property>
+				      <property name="focus_on_click">True</property>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkButton" id="button2">
+				      <property name="visible">True</property>
+				      <property name="can_focus">True</property>
+				      <property name="label">gtk-delete</property>
+				      <property name="use_stock">True</property>
+				      <property name="relief">GTK_RELIEF_NORMAL</property>
+				      <property name="focus_on_click">True</property>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>


From taru ¡÷ users.sourceforge.jp  Thu Sep  9 21:45:22 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 9 Sep 2004 21:45:22 +0900
Subject: [Ultrapossum-cvs 370] demo/haviewer 1.5,1.6,haviewer.glade
Message-ID: <20040909124522.4940D2AC04F@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/haviewer.glade,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- demo/haviewer/haviewer.glade	2004/09/09 12:40:55	1.5
+++ demo/haviewer/haviewer.glade	2004/09/09 12:45:22	1.6
@@ -453,6 +453,22 @@
 				  </child>
 
 				  <child>
+				    <widget class="GtkButton" id="button3">
+				      <property name="visible">True</property>
+				      <property name="can_focus">True</property>
+				      <property name="label">gtk-refresh</property>
+				      <property name="use_stock">True</property>
+				      <property name="relief">GTK_RELIEF_NORMAL</property>
+				      <property name="focus_on_click">True</property>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
+
+				  <child>
 				    <widget class="GtkButton" id="button2">
 				      <property name="visible">True</property>
 				      <property name="can_focus">True</property>


From taru ¡÷ users.sourceforge.jp  Thu Sep  9 21:59:46 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 9 Sep 2004 21:59:46 +0900
Subject: [Ultrapossum-cvs 371] demo/haviewer 1.6,1.7,haviewer.glade
Message-ID: <20040909125946.6CB642AC04B@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/haviewer.glade,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- demo/haviewer/haviewer.glade	2004/09/09 12:45:22	1.6
+++ demo/haviewer/haviewer.glade	2004/09/09 12:59:46	1.7
@@ -392,7 +392,7 @@
 			      <child>
 				<widget class="GtkLabel" id="label9">
 				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Test entry</property>
+				  <property name="label" translatable="yes">Entry</property>
 				  <property name="use_underline">False</property>
 				  <property name="use_markup">False</property>
 				  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -498,7 +498,7 @@
 		      <child>
 			<widget class="GtkLabel" id="label8">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Directory Modification Test</property>
+			  <property name="label" translatable="yes">Monitoring an entry</property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">True</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -558,7 +558,7 @@
 	      <child>
 		<widget class="GtkLabel" id="label7">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Test</property>
+		  <property name="label" translatable="yes">Entry Monitor</property>
 		  <property name="use_underline">False</property>
 		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>


From taru ¡÷ users.sourceforge.jp  Thu Sep  9 22:00:50 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 9 Sep 2004 22:00:50 +0900
Subject: [Ultrapossum-cvs 372] demo/haviewer 1.7,1.8,haviewer.glade
Message-ID: <20040909130050.A1A9B2AC04B@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/haviewer.glade,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- demo/haviewer/haviewer.glade	2004/09/09 12:59:46	1.7
+++ demo/haviewer/haviewer.glade	2004/09/09 13:00:50	1.8
@@ -339,7 +339,7 @@
 	      <child>
 		<widget class="GtkLabel" id="label6">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Activity</property>
+		  <property name="label" translatable="yes">Server Status</property>
 		  <property name="use_underline">False</property>
 		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>


From taru ¡÷ users.sourceforge.jp  Thu Sep  9 22:02:08 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 9 Sep 2004 22:02:08 +0900
Subject: [Ultrapossum-cvs 373] demo/haviewer 1.8,1.9,haviewer.glade
Message-ID: <20040909130208.B94062AC04B@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/haviewer.glade,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- demo/haviewer/haviewer.glade	2004/09/09 13:00:50	1.8
+++ demo/haviewer/haviewer.glade	2004/09/09 13:02:08	1.9
@@ -278,7 +278,7 @@
 		      <child>
 			<widget class="GtkLabel" id="label2">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Status Summary</property>
+			  <property name="label" translatable="yes">Summary</property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>


From taru ¡÷ users.sourceforge.jp  Thu Sep  9 22:03:32 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 9 Sep 2004 22:03:32 +0900
Subject: [Ultrapossum-cvs 374] demo/haviewer 1.9,1.10,haviewer.glade
Message-ID: <20040909130332.48A562AC04B@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/haviewer.glade,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- demo/haviewer/haviewer.glade	2004/09/09 13:02:08	1.9
+++ demo/haviewer/haviewer.glade	2004/09/09 13:03:32	1.10
@@ -364,153 +364,111 @@
 		  <property name="spacing">0</property>
 
 		  <child>
-		    <widget class="GtkFrame" id="frame2">
+		    <widget class="GtkHBox" id="hbox6">
+		      <property name="border_width">4</property>
 		      <property name="visible">True</property>
-		      <property name="label_xalign">0</property>
-		      <property name="label_yalign">0.5</property>
-		      <property name="shadow_type">GTK_SHADOW_NONE</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">8</property>
 
 		      <child>
-			<widget class="GtkAlignment" id="alignment1">
+			<widget class="GtkLabel" id="label9">
 			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Entry</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
 			  <property name="xalign">0.5</property>
 			  <property name="yalign">0.5</property>
-			  <property name="xscale">1</property>
-			  <property name="yscale">1</property>
-			  <property name="top_padding">0</property>
-			  <property name="bottom_padding">0</property>
-			  <property name="left_padding">12</property>
-			  <property name="right_padding">0</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkEntry" id="entry1">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="editable">True</property>
+			  <property name="visibility">True</property>
+			  <property name="max_length">0</property>
+			  <property name="text" translatable="yes">cn=test,o=ultrapossum</property>
+			  <property name="has_frame">True</property>
+			  <property name="invisible_char" translatable="yes">*</property>
+			  <property name="activates_default">False</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkHBox" id="hbox7">
+			  <property name="border_width">4</property>
+			  <property name="visible">True</property>
+			  <property name="homogeneous">True</property>
+			  <property name="spacing">4</property>
 
 			  <child>
-			    <widget class="GtkHBox" id="hbox6">
-			      <property name="border_width">4</property>
+			    <widget class="GtkButton" id="button1">
 			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">8</property>
+			      <property name="can_focus">True</property>
+			      <property name="label">gtk-add</property>
+			      <property name="use_stock">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
 
-			      <child>
-				<widget class="GtkLabel" id="label9">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Entry</property>
-				  <property name="use_underline">False</property>
-				  <property name="use_markup">False</property>
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkEntry" id="entry1">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="editable">True</property>
-				  <property name="visibility">True</property>
-				  <property name="max_length">0</property>
-				  <property name="text" translatable="yes">cn=test,o=ultrapossum</property>
-				  <property name="has_frame">True</property>
-				  <property name="invisible_char" translatable="yes">*</property>
-				  <property name="activates_default">False</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkHBox" id="hbox7">
-				  <property name="border_width">4</property>
-				  <property name="visible">True</property>
-				  <property name="homogeneous">True</property>
-				  <property name="spacing">4</property>
-
-				  <child>
-				    <widget class="GtkButton" id="button1">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label">gtk-add</property>
-				      <property name="use_stock">True</property>
-				      <property name="relief">GTK_RELIEF_NORMAL</property>
-				      <property name="focus_on_click">True</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkButton" id="button3">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label">gtk-refresh</property>
-				      <property name="use_stock">True</property>
-				      <property name="relief">GTK_RELIEF_NORMAL</property>
-				      <property name="focus_on_click">True</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkButton" id="button2">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label">gtk-delete</property>
-				      <property name="use_stock">True</property>
-				      <property name="relief">GTK_RELIEF_NORMAL</property>
-				      <property name="focus_on_click">True</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
+			  <child>
+			    <widget class="GtkButton" id="button3">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label">gtk-refresh</property>
+			      <property name="use_stock">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
 			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
 			  </child>
-			</widget>
-		      </child>
 
-		      <child>
-			<widget class="GtkLabel" id="label8">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Monitoring an entry</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">True</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
+			  <child>
+			    <widget class="GtkButton" id="button2">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label">gtk-delete</property>
+			      <property name="use_stock">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
 			</widget>
 			<packing>
-			  <property name="type">label_item</property>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
 			</packing>
 		      </child>
 		    </widget>


From taru ¡÷ users.sourceforge.jp  Thu Sep  9 23:55:09 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 9 Sep 2004 23:55:09 +0900
Subject: [Ultrapossum-cvs 375] demo/haviewer 1.21,1.22,haviewer.rb
Message-ID: <20040909145510.00C0A2AC04B@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/haviewer.rb,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- demo/haviewer/haviewer.rb	2004/09/09 12:36:52	1.21
+++ demo/haviewer/haviewer.rb	2004/09/09 14:55:09	1.22
@@ -176,16 +176,36 @@
         Column.size.times do |i|
           @columns << Gtk::TreeViewColumn.new(Column[i], Gtk::CellRendererText.new, { :markup => i })
         end
-	 @row = {} 
-#        h = Host.new(`ultrapossum-config get MASTER`.gsub!(/MASTER="(.+)"\n/, '\1'), "master" )
-#	@row[h] = @list.append
-#        Hosts << h
-        backup = `ultrapossum-config get BACKUP`.gsub!(/BACKUP="(.+)"\n/, '\1')
-        `ultrapossum-config get SLAVES`.gsub!(/SLAVES="(.*)"\n/, '\1').split(' ').each do |s|
-          h = Host.new(s.chomp, "master" ) # (backup==s)?"master":"slave" )
-	  @row[h] = @list.append
-          Hosts << h
-        end
+	@row = {} 
+	hash = {}
+	`ultrapossum-config get MASTER BACKUP SYNCBACKUPS`.each_line do |line|
+	  host = nil
+	  case line
+	  when /(MASTER|BACKUP|SYNCBACKUPS)="(.+)"\n/
+	    $2.split(' ').each do |s|
+	      host = Host.new(s,"master")
+              if hash[s].nil?
+	        @row[host] = @list.append
+	        Hosts << host
+	        hash[s] = host
+              end
+	    end
+	  end
+	end
+	`ultrapossum-config get SLAVES`.each_line do |line|
+	  host = nil
+	  case line
+	  when /SLAVES="(.+)"\n/
+	    $1.split(' ').each do |s|
+	      host = Host.new(s,"slave")
+              if hash[s].nil?
+	        @row[host] = @list.append
+	        Hosts << host
+	        hash[s] = host
+              end
+	    end
+	  end
+	end
         @master_icon = Signal::SignalFactory.create
         @slave_icon = Signal::SignalFactory.create
         columns.each do |val|
@@ -246,11 +266,11 @@
 
     class UltraPossumTest < View
 
-     Column = ["S", "Host", "Type", "Status" ]
+     Column = ["S", "Host", "Type", "Status", "entryCSN" ]
 
       def initialize(haview)
         super
-        @list = Gtk::ListStore.new( String, String, String, String )
+        @list = Gtk::ListStore.new( String, String, String, String, String )
         @columns = []
         Column.size.times do |i|
           @columns << Gtk::TreeViewColumn.new(Column[i], Gtk::CellRendererText.new, { :markup => i })


From taru ¡÷ users.sourceforge.jp  Fri Sep 10 00:45:14 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 10 Sep 2004 00:45:14 +0900
Subject: [Ultrapossum-cvs 376] demo/haviewer 1.10, 1.11, haviewer.glade 1.22,
	1.23, haviewer.rb
Message-ID: <20040909154514.0D9C02AC02B@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/haviewer.glade,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- demo/haviewer/haviewer.glade	2004/09/09 13:03:32	1.10
+++ demo/haviewer/haviewer.glade	2004/09/09 15:45:13	1.11
@@ -392,13 +392,13 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkEntry" id="entry1">
+			<widget class="GtkEntry" id="monitor_entry">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
 			  <property name="editable">True</property>
 			  <property name="visibility">True</property>
 			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes">cn=test,o=ultrapossum</property>
+			  <property name="text" translatable="yes">cn=u0001,o=ultrapossum</property>
 			  <property name="has_frame">True</property>
 			  <property name="invisible_char" translatable="yes">*</property>
 			  <property name="activates_default">False</property>
===================================================================
RCS file: demo/haviewer/haviewer.rb,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- demo/haviewer/haviewer.rb	2004/09/09 14:55:09	1.22
+++ demo/haviewer/haviewer.rb	2004/09/09 15:45:13	1.23
@@ -95,11 +95,6 @@
 
   class Host
 
-    OID = "private.12345"  # .2.101.1"
-    OID_STATUS = OID + ".1.1.0"
-    OID_PID = OID + ".1.2.0"
-    OID_SINCE = OID + ".1.3.0"
-
     def initialize( host, type )
       super();
       @host = host;
@@ -108,51 +103,12 @@
       @type = type
     end
 
-    def snmp
-      statusbuf = nil
-      pidbuf = nil
-      sincebuf = nil
-      puts "snmpget -v1 -t 3 -c ultrapossum #{@host} #{OID_STATUS} #{OID_PID} #{OID_SINCE}" if $DEBUG
-      buf = `snmpget -v1 -t 3 -c ultrapossum #{@host} #{OID_STATUS} #{OID_PID} #{OID_SINCE}`
-      buf.each_line do |line|
-        case line
-	when /#{OID_STATUS}/
-          statusbuf = line.gsub(/^[^"]+"(.*)"\n/, '\1')
-	  statusbuf = "-----" if statusbuf.size == 0
-        when /#{OID_PID}/
-          pidbuf = line.gsub(/^[^"]+"(.*)"\n/, '\1')
-	  pidbuf = "-----" if pidbuf.size == 0
-	when /#{OID_SINCE}/
-          sincebuf = line.gsub(/^[^"]+"(.*)"\n/, '\1')
-	  sincebuf = "-----" if sincebuf.size == 0
-	end
-      end
-      @status = statusbuf
-      @pid = pidbuf
-      @since = sincebuf
-
-      c = ""
-      case @status
-      when "DEAD"
-        c = Red
-      when "STOP"
-        c = Red
-      when "ACTIVE"
-        c = Green
-      when "FAOVER"
-        c = Yellow
-      when "STANDBY"
-        c = Green
-      when "RUN"
-        c = Green
-      end
-      @sign.on(c)
-
+    def update
     end
 
     attr_reader :row, :host, :sign
-    attr_accessor :type, :status, :pid, :since
-
+    attr_accessor :type
+    
   end
 
   class View
@@ -166,46 +122,121 @@
     end
 
     class UltraPossum < View
-    
-      Column = ["S", "Host", "Type", "Status", "Pid", "Since" ]
+  
+      class UltraPossumHost < Host
 
-      def initialize(haview)
-        super
-        @list = Gtk::ListStore.new( String, String, String, String, String, String)
-        @columns = []
-        Column.size.times do |i|
-          @columns << Gtk::TreeViewColumn.new(Column[i], Gtk::CellRendererText.new, { :markup => i })
+        OID = "private.12345"  # .2.101.1"
+        OID_STATUS = OID + ".1.1.0"
+        OID_PID = OID + ".1.2.0"
+        OID_SINCE = OID + ".1.3.0"
+
+        def update
+	  snmp
+	  monitor_entry
+	end
+
+        def monitor_entry
+	  @entryCSN = ""
+	  `ldapsearch -x -h #{@host} -b  cn=u0001,o=ultrapossum -s base -LLL +`.each_line do |line|
+            case line
+	    when /entryCSN: (.+)/
+              @entryCSN = $1
+	    end
+	  end
+	end
+
+        def snmp
+          statusbuf = nil
+          pidbuf = nil
+          sincebuf = nil
+          puts "snmpget -v1 -t 3 -c ultrapossum #{@host} #{OID_STATUS} #{OID_PID} #{OID_SINCE}" if $DEBUG
+          buf = `snmpget -v1 -t 3 -c ultrapossum #{@host} #{OID_STATUS} #{OID_PID} #{OID_SINCE}`
+          buf.each_line do |line|
+            case line
+    	    when /#{OID_STATUS}/
+              statusbuf = line.gsub(/^[^"]+"(.*)"\n/, '\1')
+	      statusbuf = "-----" if statusbuf.size == 0
+            when /#{OID_PID}/
+              pidbuf = line.gsub(/^[^"]+"(.*)"\n/, '\1')
+	      pidbuf = "-----" if pidbuf.size == 0
+    	    when /#{OID_SINCE}/
+              sincebuf = line.gsub(/^[^"]+"(.*)"\n/, '\1')
+	      sincebuf = "-----" if sincebuf.size == 0
+	    end
+          end
+          @status = statusbuf
+          @pid = pidbuf
+          @since = sincebuf
+
+          c = ""
+          case @status
+          when "DEAD"
+            c = Red
+          when "STOP"
+            c = Red
+          when "ACTIVE"
+            c = Green
+          when "FAOVER"
+            c = Yellow
+          when "STANDBY"
+            c = Green
+          when "RUN"
+            c = Green
+          end
+          @sign.on(c)
         end
-	@row = {} 
-	hash = {}
-	`ultrapossum-config get MASTER BACKUP SYNCBACKUPS`.each_line do |line|
-	  host = nil
-	  case line
-	  when /(MASTER|BACKUP|SYNCBACKUPS)="(.+)"\n/
-	    $2.split(' ').each do |s|
-	      host = Host.new(s,"master")
+
+        attr_accessor :status, :pid, :since, :entryCSN
+
+      end
+
+      UltraPossumHosts = []
+      begin
+        hash = {}
+        `ultrapossum-config get MASTER BACKUP SYNCBACKUPS`.each_line do |line|
+        host = nil
+        case line
+          when /(MASTER|BACKUP|SYNCBACKUPS)="(.+)"\n/
+            $2.split(' ').each do |s|
+              host = UltraPossumHost.new(s,"master")
               if hash[s].nil?
-	        @row[host] = @list.append
-	        Hosts << host
+	        UltraPossumHosts << host
+		Hosts << host
 	        hash[s] = host
               end
 	    end
-	  end
-	end
+          end
+        end
 	`ultrapossum-config get SLAVES`.each_line do |line|
 	  host = nil
 	  case line
 	  when /SLAVES="(.+)"\n/
 	    $1.split(' ').each do |s|
-	      host = Host.new(s,"slave")
+	      host = UltraPossumHost.new(s,"slave")
               if hash[s].nil?
 	        @row[host] = @list.append
-	        Hosts << host
+	        UltraPossumHosts << host
+		Hosts << host
 	        hash[s] = host
               end
 	    end
 	  end
 	end
+      end
+
+      Column = ["S", "Host", "Type", "Status", "Pid", "Since" ]
+
+      def initialize(haview)
+        super
+        @list = Gtk::ListStore.new( String, String, String, String, String, String)
+        @columns = []
+        Column.size.times do |i|
+          @columns << Gtk::TreeViewColumn.new(Column[i], Gtk::CellRendererText.new, { :markup => i })
+        end
+	@row = {}
+	UltraPossumHosts.each do |host|
+          @row[host] = @list.append
+	end
         @master_icon = Signal::SignalFactory.create
         @slave_icon = Signal::SignalFactory.create
         columns.each do |val|
@@ -227,7 +258,7 @@
       def summary
         master = ""
         slave = ""
-        Hosts.each do |h|
+        UltraPossumHosts.each do |h|
           if h.type == "master"
             case h.status
             when "ACTIVE"
@@ -262,23 +293,33 @@
   
       attr_reader :list, :columns
 
-    end
-
-    class UltraPossumTest < View
+      class EntryView < View
 
-     Column = ["S", "Host", "Type", "Status", "entryCSN" ]
+       Column = ["S", "Host", "Type", "Status", "entryCSN" ]
 
-      def initialize(haview)
-        super
-        @list = Gtk::ListStore.new( String, String, String, String, String )
-        @columns = []
-        Column.size.times do |i|
-          @columns << Gtk::TreeViewColumn.new(Column[i], Gtk::CellRendererText.new, { :markup => i })
-        end
-        @columns.each do |val|
-          @glade["treeview2"].append_column(val)
+        def initialize(haview)
+          super
+          @list = Gtk::ListStore.new( String, String, String, String, String )
+          @columns = []
+          Column.size.times do |i|
+            @columns << Gtk::TreeViewColumn.new(Column[i], Gtk::CellRendererText.new, { :markup => i })
+          end
+  	  @row = {}
+	  UltraPossumHosts.each do |host|
+            @row[host] = @list.append
+	  end
+          @columns.each do |val|
+            @glade["treeview2"].append_column(val)
+          end
+          @glade["treeview2"].set_model(@list)
         end
-        @glade["treeview2"].set_model(@list)
+
+        def update(host)
+          @list.set_value(@row[host], 1, host.host)
+          @list.set_value(@row[host], 2, host.type)
+          @list.set_value(@row[host], 4, host.entryCSN)
+	end
+
       end
 
     end
@@ -310,7 +351,7 @@
 
 haview = HAViewer.new('haviewer.glade')
 haview.add_view( HAViewer::View::UltraPossum.new(haview) )
-haview.add_view( HAViewer::View::UltraPossumTest.new(haview) )
+haview.add_view( HAViewer::View::UltraPossum::EntryView.new(haview) )
 haview.update
 HAViewer::Hosts.each do |host|
   haview.views.each do |view|
@@ -318,7 +359,7 @@
   end
   Thread.new {
     while(1) do
-      host.snmp
+      host.update
       haview.views.each do |view|
         view.update(host)
 	haview.update


From taru ¡÷ users.sourceforge.jp  Fri Sep 10 18:22:22 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 10 Sep 2004 18:22:22 +0900
Subject: [Ultrapossum-cvs 377] demo/haviewer 1.11, 1.12, haviewer.glade 1.23,
	1.24, haviewer.rb
Message-ID: <20040910092222.2B8D12AC019@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/haviewer.glade,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- demo/haviewer/haviewer.glade	2004/09/09 15:45:13	1.11
+++ demo/haviewer/haviewer.glade	2004/09/10 09:22:21	1.12
@@ -359,7 +359,6 @@
 		<widget class="GtkVBox" id="vbox4">
 		  <property name="border_width">4</property>
 		  <property name="visible">True</property>
-		  <property name="sensitive">False</property>
 		  <property name="homogeneous">False</property>
 		  <property name="spacing">0</property>
 
@@ -367,6 +366,7 @@
 		    <widget class="GtkHBox" id="hbox6">
 		      <property name="border_width">4</property>
 		      <property name="visible">True</property>
+		      <property name="sensitive">False</property>
 		      <property name="homogeneous">False</property>
 		      <property name="spacing">8</property>
 
@@ -480,24 +480,178 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkScrolledWindow" id="scrolledwindow2">
-		      <property name="border_width">4</property>
+		    <widget class="GtkVBox" id="vbox5">
 		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-		      <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-		      <property name="shadow_type">GTK_SHADOW_NONE</property>
-		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">0</property>
+
+		      <child>
+			<widget class="GtkHBox" id="hbox8">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+
+			  <child>
+			    <widget class="GtkFrame" id="frame2">
+			      <property name="visible">True</property>
+			      <property name="label_xalign">0</property>
+			      <property name="label_yalign">0.5</property>
+			      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+			      <child>
+				<widget class="GtkAlignment" id="alignment1">
+				  <property name="border_width">2</property>
+				  <property name="visible">True</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xscale">1</property>
+				  <property name="yscale">1</property>
+				  <property name="top_padding">0</property>
+				  <property name="bottom_padding">0</property>
+				  <property name="left_padding">12</property>
+				  <property name="right_padding">4</property>
+
+				  <child>
+				    <widget class="GtkLabel" id="monitored_entry">
+				      <property name="visible">True</property>
+				      <property name="label" translatable="yes">XXXXXXXX</property>
+				      <property name="use_underline">False</property>
+				      <property name="use_markup">False</property>
+				      <property name="justify">GTK_JUSTIFY_LEFT</property>
+				      <property name="wrap">False</property>
+				      <property name="selectable">False</property>
+				      <property name="xalign">0.5</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xpad">0</property>
+				      <property name="ypad">0</property>
+				    </widget>
+				  </child>
+				</widget>
+			      </child>
+
+			      <child>
+				<widget class="GtkLabel" id="label14">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Entry</property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">True</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				</widget>
+				<packing>
+				  <property name="type">label_item</property>
+				</packing>
+			      </child>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkFrame" id="frame3">
+			      <property name="visible">True</property>
+			      <property name="label_xalign">0</property>
+			      <property name="label_yalign">0.5</property>
+			      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+			      <child>
+				<widget class="GtkAlignment" id="alignment2">
+				  <property name="border_width">2</property>
+				  <property name="visible">True</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xscale">1</property>
+				  <property name="yscale">1</property>
+				  <property name="top_padding">0</property>
+				  <property name="bottom_padding">0</property>
+				  <property name="left_padding">12</property>
+				  <property name="right_padding">4</property>
+
+				  <child>
+				    <widget class="GtkLabel" id="latest_entrycsn">
+				      <property name="visible">True</property>
+				      <property name="label" translatable="yes">XXXXXXXX</property>
+				      <property name="use_underline">False</property>
+				      <property name="use_markup">False</property>
+				      <property name="justify">GTK_JUSTIFY_LEFT</property>
+				      <property name="wrap">False</property>
+				      <property name="selectable">False</property>
+				      <property name="xalign">0.5</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xpad">0</property>
+				      <property name="ypad">0</property>
+				    </widget>
+				  </child>
+				</widget>
+			      </child>
+
+			      <child>
+				<widget class="GtkLabel" id="label16">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Latest entryCSN</property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">True</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				</widget>
+				<packing>
+				  <property name="type">label_item</property>
+				</packing>
+			      </child>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
 
 		      <child>
-			<widget class="GtkTreeView" id="treeview2">
+			<widget class="GtkScrolledWindow" id="scrolledwindow2">
+			  <property name="border_width">4</property>
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
-			  <property name="headers_visible">True</property>
-			  <property name="rules_hint">False</property>
-			  <property name="reorderable">False</property>
-			  <property name="enable_search">True</property>
+			  <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+			  <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+			  <property name="shadow_type">GTK_SHADOW_NONE</property>
+			  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+			  <child>
+			    <widget class="GtkTreeView" id="treeview2">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="headers_visible">True</property>
+			      <property name="rules_hint">False</property>
+			      <property name="reorderable">False</property>
+			      <property name="enable_search">True</property>
+			    </widget>
+			  </child>
 			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
 		      </child>
 		    </widget>
 		    <packing>
===================================================================
RCS file: demo/haviewer/haviewer.rb,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- demo/haviewer/haviewer.rb	2004/09/09 15:45:13	1.23
+++ demo/haviewer/haviewer.rb	2004/09/10 09:22:21	1.24
@@ -2,6 +2,7 @@
 
 require 'uconv'
 require 'libglade2'
+require 'ultrapossum'
 
 def on_close_clicked
   Gtk.main_quit
@@ -32,7 +33,6 @@
      end
    end
 
-
     DarkGreen = "#005500"
     DarkYellow = "#555500"
     DarkRed = "#550000"
@@ -100,13 +100,14 @@
       @host = host;
       @status = ""
       @sign = Signal::SignalFactory.create
+      @repl_sign = Signal::SignalFactory.create
       @type = type
     end
 
     def update
     end
 
-    attr_reader :row, :host, :sign
+    attr_reader :row, :host, :sign, :repl_sign
     attr_accessor :type
     
   end
@@ -130,6 +131,36 @@
         OID_PID = OID + ".1.2.0"
         OID_SINCE = OID + ".1.3.0"
 
+        @@latest_entryCSN = ""
+	@@monitored_entry = "cn=u0001,o=ultrapossum"
+
+        def UltraPossumHost.update_latest_entryCSN
+	  `ldapsearch -l 1 -x -h #{Conf["LDAPMASTER"]} -b #{@@monitored_entry} -s base -LLL +`.each_line do |line|
+            case line
+	    when /entryCSN: (.+)/
+              @@latest_entryCSN = $1
+	    end
+	  end
+	  UltraPossumHosts.each do |host|
+	    case host.entryCSN
+	    when @@latest_entryCSN
+	      host.repl_sign.on(Green)
+	    when ""
+              host.repl_sign.off
+	    else
+	      host.repl_sign.on(Yellow)
+	    end
+	  end
+        end
+
+	def UltraPossumHost.monitored_entry
+	  @@monitored_entry
+	end
+	
+	def UltraPossumHost.latest_entryCSN
+	  @@latest_entryCSN
+	end
+
         def update
 	  snmp
 	  monitor_entry
@@ -137,12 +168,22 @@
 
         def monitor_entry
 	  @entryCSN = ""
-	  `ldapsearch -x -h #{@host} -b  cn=u0001,o=ultrapossum -s base -LLL +`.each_line do |line|
+	  return if ! avail?
+	  `ldapsearch -l 1 -x -h #{@host} -b #{@@monitored_entry} -s base -LLL +`.each_line do |line|
             case line
 	    when /entryCSN: (.+)/
               @entryCSN = $1
 	    end
 	  end
+	  UltraPossumHost.update_latest_entryCSN
+          case @entryCSN
+	  when @@latest_entryCSN
+            @repl_sign.on(Green)
+	  when ""
+	    @repl_sign.off
+	  else
+	    @repl_sign.on(Red)
+	  end
 	end
 
         def snmp
@@ -186,39 +227,40 @@
           @sign.on(c)
         end
 
+        def avail?
+          return true if @status == "STANDBY" || @status == "ACTIVE" || @status == "RUN"
+	  return false
+	end
+
         attr_accessor :status, :pid, :since, :entryCSN
 
       end
 
+      Conf = ::UltraPossum::Config.new
       UltraPossumHosts = []
       begin
         hash = {}
-        `ultrapossum-config get MASTER BACKUP SYNCBACKUPS`.each_line do |line|
-        host = nil
-        case line
-          when /(MASTER|BACKUP|SYNCBACKUPS)="(.+)"\n/
-            $2.split(' ').each do |s|
-              host = UltraPossumHost.new(s,"master")
-              if hash[s].nil?
-	        UltraPossumHosts << host
-		Hosts << host
-	        hash[s] = host
-              end
-	    end
-          end
+	ary =  [ Conf["MASTER"], Conf["BACKUP"], Conf["SYNCBACKUPS"] ]
+	ary.each do |val|
+	  next if val.nil?
+          host = nil
+          val.split(' ').each do |s|
+            host = UltraPossumHost.new(s,"master")
+            if hash[s].nil?
+	      UltraPossumHosts << host
+              Hosts << host
+	      hash[s] = host
+            end
+	  end
         end
-	`ultrapossum-config get SLAVES`.each_line do |line|
-	  host = nil
-	  case line
-	  when /SLAVES="(.+)"\n/
-	    $1.split(' ').each do |s|
-	      host = UltraPossumHost.new(s,"slave")
-              if hash[s].nil?
-	        @row[host] = @list.append
-	        UltraPossumHosts << host
-		Hosts << host
-	        hash[s] = host
-              end
+	if ! Conf["SLAVES"].nil?
+	  Conf["SLAVES"].split(' ').each do |s|
+	    host = UltraPossumHost.new(s,"slave")
+            if hash[s].nil?
+	      @row[host] = @list.append
+	      UltraPossumHosts << host
+	      Hosts << host
+	      hash[s] = host
 	    end
 	  end
 	end
@@ -315,9 +357,14 @@
         end
 
         def update(host)
-          @list.set_value(@row[host], 1, host.host)
-          @list.set_value(@row[host], 2, host.type)
-          @list.set_value(@row[host], 4, host.entryCSN)
+	  UltraPossumHosts.each do |host|
+            @list.set_value(@row[host], 0, host.repl_sign.to_s )
+            @list.set_value(@row[host], 1, host.host)
+            @list.set_value(@row[host], 2, host.type)
+            @list.set_value(@row[host], 4, host.entryCSN)
+	  end
+          @glade["monitored_entry"].set_text(UltraPossumHost::monitored_entry)
+          @glade["latest_entrycsn"].set_text(UltraPossumHost::latest_entryCSN)
 	end
 
       end


From taru ¡÷ users.sourceforge.jp  Fri Sep 10 18:22:33 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 10 Sep 2004 18:22:33 +0900
Subject: [Ultrapossum-cvs 378] demo/haviewer NONE,1.1,ultrapossum.rb
Message-ID: <20040910092233.087922AC019@users.sourceforge.jp>



From taru ¡÷ users.sourceforge.jp  Fri Sep 10 18:24:45 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 10 Sep 2004 18:24:45 +0900
Subject: [Ultrapossum-cvs 379] demo/haviewer 1.24,1.25,haviewer.rb
Message-ID: <20040910092445.1DD392AC019@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/haviewer.rb,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- demo/haviewer/haviewer.rb	2004/09/10 09:22:21	1.24
+++ demo/haviewer/haviewer.rb	2004/09/10 09:24:45	1.25
@@ -337,11 +337,11 @@
 
       class EntryView < View
 
-       Column = ["S", "Host", "Type", "Status", "entryCSN" ]
+       Column = ["S", "Host", "Type", "entryCSN" ]
 
         def initialize(haview)
           super
-          @list = Gtk::ListStore.new( String, String, String, String, String )
+          @list = Gtk::ListStore.new( String, String, String, String )
           @columns = []
           Column.size.times do |i|
             @columns << Gtk::TreeViewColumn.new(Column[i], Gtk::CellRendererText.new, { :markup => i })
@@ -361,7 +361,7 @@
             @list.set_value(@row[host], 0, host.repl_sign.to_s )
             @list.set_value(@row[host], 1, host.host)
             @list.set_value(@row[host], 2, host.type)
-            @list.set_value(@row[host], 4, host.entryCSN)
+            @list.set_value(@row[host], 3, host.entryCSN)
 	  end
           @glade["monitored_entry"].set_text(UltraPossumHost::monitored_entry)
           @glade["latest_entrycsn"].set_text(UltraPossumHost::latest_entryCSN)


From taru ¡÷ users.sourceforge.jp  Fri Sep 10 19:36:05 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 10 Sep 2004 19:36:05 +0900
Subject: [Ultrapossum-cvs 380] demo/haviewer 1.12, 1.13, haviewer.glade 1.25,
	1.26, haviewer.rb
Message-ID: <20040910103605.89B4E2AC019@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/haviewer.glade,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- demo/haviewer/haviewer.glade	2004/09/10 09:22:21	1.12
+++ demo/haviewer/haviewer.glade	2004/09/10 10:36:05	1.13
@@ -366,7 +366,6 @@
 		    <widget class="GtkHBox" id="hbox6">
 		      <property name="border_width">4</property>
 		      <property name="visible">True</property>
-		      <property name="sensitive">False</property>
 		      <property name="homogeneous">False</property>
 		      <property name="spacing">8</property>
 
@@ -394,8 +393,9 @@
 		      <child>
 			<widget class="GtkEntry" id="monitor_entry">
 			  <property name="visible">True</property>
+			  <property name="sensitive">False</property>
 			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
+			  <property name="editable">False</property>
 			  <property name="visibility">True</property>
 			  <property name="max_length">0</property>
 			  <property name="text" translatable="yes">cn=u0001,o=ultrapossum</property>
@@ -420,6 +420,7 @@
 			  <child>
 			    <widget class="GtkButton" id="button1">
 			      <property name="visible">True</property>
+			      <property name="sensitive">False</property>
 			      <property name="can_focus">True</property>
 			      <property name="label">gtk-add</property>
 			      <property name="use_stock">True</property>
@@ -434,13 +435,72 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkButton" id="button3">
+			    <widget class="GtkButton" id="entry_update">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
-			      <property name="label">gtk-refresh</property>
-			      <property name="use_stock">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
 			      <property name="focus_on_click">True</property>
+			      <signal name="clicked" handler="on_entry_update_clicked" last_modification_time="Fri, 10 Sep 2004 09:30:03 GMT"/>
+
+			      <child>
+				<widget class="GtkAlignment" id="alignment3">
+				  <property name="visible">True</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xscale">0</property>
+				  <property name="yscale">0</property>
+				  <property name="top_padding">0</property>
+				  <property name="bottom_padding">0</property>
+				  <property name="left_padding">0</property>
+				  <property name="right_padding">0</property>
+
+				  <child>
+				    <widget class="GtkHBox" id="hbox10">
+				      <property name="visible">True</property>
+				      <property name="homogeneous">False</property>
+				      <property name="spacing">2</property>
+
+				      <child>
+					<widget class="GtkImage" id="image3">
+					  <property name="visible">True</property>
+					  <property name="stock">gtk-execute</property>
+					  <property name="icon_size">4</property>
+					  <property name="xalign">0.5</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+
+				      <child>
+					<widget class="GtkLabel" id="label18">
+					  <property name="visible">True</property>
+					  <property name="label" translatable="yes">Modify</property>
+					  <property name="use_underline">True</property>
+					  <property name="use_markup">False</property>
+					  <property name="justify">GTK_JUSTIFY_LEFT</property>
+					  <property name="wrap">False</property>
+					  <property name="selectable">False</property>
+					  <property name="xalign">0.5</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+				    </widget>
+				  </child>
+				</widget>
+			      </child>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -452,8 +512,9 @@
 			  <child>
 			    <widget class="GtkButton" id="button2">
 			      <property name="visible">True</property>
+			      <property name="sensitive">False</property>
 			      <property name="can_focus">True</property>
-			      <property name="label">gtk-delete</property>
+			      <property name="label">gtk-remove</property>
 			      <property name="use_stock">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
 			      <property name="focus_on_click">True</property>
===================================================================
RCS file: demo/haviewer/haviewer.rb,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- demo/haviewer/haviewer.rb	2004/09/10 09:24:45	1.25
+++ demo/haviewer/haviewer.rb	2004/09/10 10:36:05	1.26
@@ -8,6 +8,10 @@
   Gtk.main_quit
 end
 
+def on_entry_update_clicked
+  $haview.views["entry"].entry_update
+end
+
 class HAViewer
 
   Hosts = []
@@ -175,7 +179,7 @@
               @entryCSN = $1
 	    end
 	  end
-	  UltraPossumHost.update_latest_entryCSN
+#	  UltraPossumHost.update_latest_entryCSN
           case @entryCSN
 	  when @@latest_entryCSN
             @repl_sign.on(Green)
@@ -265,6 +269,7 @@
 	  end
 	end
       end
+      UltraPossumHost.update_latest_entryCSN
 
       Column = ["S", "Host", "Type", "Status", "Pid", "Since" ]
 
@@ -337,7 +342,27 @@
 
       class EntryView < View
 
-       Column = ["S", "Host", "Type", "entryCSN" ]
+        def entry_update
+          open("|ldapmodify -x -h #{Conf["LDAPMASTER"]} -D #{Conf["ROOTDN"]} -w #{Conf["ROOTPW"]} > /dev/null", "w") { |io|
+	    date=`sh -c 'LANG=C date'`
+            io.puts <<EOF
+dn: #{UltraPossumHost::monitored_entry}
+changetype: modify
+replace: description
+description: #{date}
+EOF
+	  }
+	  UltraPossumHost.update_latest_entryCSN
+#          @glade["latest_entrycsn"].set_text(UltraPossumHost::latest_entryCSN)
+	  UltraPossumHosts.each do |host|
+	    host.monitor_entry
+	  end
+	  UltraPossumHosts.each do |host|
+	    update(host)
+	  end
+	end
+
+        Column = ["S", "Host", "Type", "entryCSN" ]
 
         def initialize(haview)
           super
@@ -377,12 +402,12 @@
 
   def initialize(glade)
     @glade = @glade = GladeXML.new(glade) {|handler| method(handler)}
-    @views = []
+    @views = {}
     update
   end
 
-  def add_view(view)
-    @views << view
+  def add_view(name, view)
+    @views[name] = view
   end
 
   def update
@@ -396,20 +421,20 @@
 
 Gtk.init
 
-haview = HAViewer.new('haviewer.glade')
-haview.add_view( HAViewer::View::UltraPossum.new(haview) )
-haview.add_view( HAViewer::View::UltraPossum::EntryView.new(haview) )
-haview.update
+$haview = HAViewer.new('haviewer.glade')
+$haview.add_view( "status", HAViewer::View::UltraPossum.new($haview) )
+$haview.add_view( "entry", HAViewer::View::UltraPossum::EntryView.new($haview) )
+$haview.update
 HAViewer::Hosts.each do |host|
-  haview.views.each do |view|
+  $haview.views.each do |name,view|
     view.update(host)
   end
   Thread.new {
     while(1) do
       host.update
-      haview.views.each do |view|
+      $haview.views.each do |name,view|
         view.update(host)
-	haview.update
+	$haview.update
       end
       sleep 5
     end


From taru ¡÷ users.sourceforge.jp  Fri Sep 10 20:40:28 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 10 Sep 2004 20:40:28 +0900
Subject: [Ultrapossum-cvs 381] demo/haviewer 1.13, 1.14, haviewer.glade 1.26,
	1.27, haviewer.rb
Message-ID: <20040910114028.5ABE52AC019@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/haviewer.glade,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- demo/haviewer/haviewer.glade	2004/09/10 10:36:05	1.13
+++ demo/haviewer/haviewer.glade	2004/09/10 11:40:28	1.14
@@ -363,220 +363,77 @@
 		  <property name="spacing">0</property>
 
 		  <child>
-		    <widget class="GtkHBox" id="hbox6">
+		    <widget class="GtkHBox" id="hbox10">
 		      <property name="border_width">4</property>
 		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
 		      <property name="spacing">8</property>
 
 		      <child>
-			<widget class="GtkLabel" id="label9">
+			<widget class="GtkButton" id="button4">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Entry</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
+			  <property name="can_focus">True</property>
+			  <property name="label">gtk-refresh</property>
+			  <property name="use_stock">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
 			  <property name="expand">False</property>
 			  <property name="fill">False</property>
+			  <property name="pack_type">GTK_PACK_END</property>
 			</packing>
 		      </child>
 
 		      <child>
-			<widget class="GtkEntry" id="monitor_entry">
+			<widget class="GtkButton" id="entry_update">
 			  <property name="visible">True</property>
-			  <property name="sensitive">False</property>
 			  <property name="can_focus">True</property>
-			  <property name="editable">False</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes">cn=u0001,o=ultrapossum</property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox7">
-			  <property name="border_width">4</property>
-			  <property name="visible">True</property>
-			  <property name="homogeneous">True</property>
-			  <property name="spacing">4</property>
-
-			  <child>
-			    <widget class="GtkButton" id="button1">
-			      <property name="visible">True</property>
-			      <property name="sensitive">False</property>
-			      <property name="can_focus">True</property>
-			      <property name="label">gtk-add</property>
-			      <property name="use_stock">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			  <signal name="clicked" handler="on_entry_update_clicked" last_modification_time="Fri, 10 Sep 2004 09:30:03 GMT"/>
 
 			  <child>
-			    <widget class="GtkButton" id="entry_update">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <signal name="clicked" handler="on_entry_update_clicked" last_modification_time="Fri, 10 Sep 2004 09:30:03 GMT"/>
+			    <widget class="GtkAlignment" id="alignment3">
+			      <property name="visible">True</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xscale">0</property>
+			      <property name="yscale">0</property>
+			      <property name="top_padding">0</property>
+			      <property name="bottom_padding">0</property>
+			      <property name="left_padding">0</property>
+			      <property name="right_padding">0</property>
 
 			      <child>
-				<widget class="GtkAlignment" id="alignment3">
+				<widget class="GtkHBox" id="hbox10">
 				  <property name="visible">True</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xscale">0</property>
-				  <property name="yscale">0</property>
-				  <property name="top_padding">0</property>
-				  <property name="bottom_padding">0</property>
-				  <property name="left_padding">0</property>
-				  <property name="right_padding">0</property>
+				  <property name="homogeneous">False</property>
+				  <property name="spacing">2</property>
 
 				  <child>
-				    <widget class="GtkHBox" id="hbox10">
+				    <widget class="GtkImage" id="image3">
 				      <property name="visible">True</property>
-				      <property name="homogeneous">False</property>
-				      <property name="spacing">2</property>
-
-				      <child>
-					<widget class="GtkImage" id="image3">
-					  <property name="visible">True</property>
-					  <property name="stock">gtk-execute</property>
-					  <property name="icon_size">4</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xpad">0</property>
-					  <property name="ypad">0</property>
-					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">False</property>
-					  <property name="fill">False</property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkLabel" id="label18">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">Modify</property>
-					  <property name="use_underline">True</property>
-					  <property name="use_markup">False</property>
-					  <property name="justify">GTK_JUSTIFY_LEFT</property>
-					  <property name="wrap">False</property>
-					  <property name="selectable">False</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xpad">0</property>
-					  <property name="ypad">0</property>
-					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">False</property>
-					  <property name="fill">False</property>
-					</packing>
-				      </child>
+				      <property name="stock">gtk-execute</property>
+				      <property name="icon_size">4</property>
+				      <property name="xalign">0.5</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xpad">0</property>
+				      <property name="ypad">0</property>
 				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
 				  </child>
-				</widget>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkButton" id="button2">
-			      <property name="visible">True</property>
-			      <property name="sensitive">False</property>
-			      <property name="can_focus">True</property>
-			      <property name="label">gtk-remove</property>
-			      <property name="use_stock">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox5">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox8">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">0</property>
-
-			  <child>
-			    <widget class="GtkFrame" id="frame2">
-			      <property name="visible">True</property>
-			      <property name="label_xalign">0</property>
-			      <property name="label_yalign">0.5</property>
-			      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-			      <child>
-				<widget class="GtkAlignment" id="alignment1">
-				  <property name="border_width">2</property>
-				  <property name="visible">True</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xscale">1</property>
-				  <property name="yscale">1</property>
-				  <property name="top_padding">0</property>
-				  <property name="bottom_padding">0</property>
-				  <property name="left_padding">12</property>
-				  <property name="right_padding">4</property>
 
 				  <child>
-				    <widget class="GtkLabel" id="monitored_entry">
+				    <widget class="GtkLabel" id="label18">
 				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">XXXXXXXX</property>
-				      <property name="use_underline">False</property>
+				      <property name="label" translatable="yes">Test!</property>
+				      <property name="use_underline">True</property>
 				      <property name="use_markup">False</property>
 				      <property name="justify">GTK_JUSTIFY_LEFT</property>
 				      <property name="wrap">False</property>
@@ -586,16 +443,51 @@
 				      <property name="xpad">0</property>
 				      <property name="ypad">0</property>
 				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
 				  </child>
 				</widget>
 			      </child>
+			    </widget>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			  <property name="pack_type">GTK_PACK_END</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkFrame" id="frame2">
+			  <property name="visible">True</property>
+			  <property name="label_xalign">0</property>
+			  <property name="label_yalign">0.5</property>
+			  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+			  <child>
+			    <widget class="GtkAlignment" id="alignment1">
+			      <property name="border_width">2</property>
+			      <property name="visible">True</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xscale">1</property>
+			      <property name="yscale">1</property>
+			      <property name="top_padding">0</property>
+			      <property name="bottom_padding">0</property>
+			      <property name="left_padding">12</property>
+			      <property name="right_padding">4</property>
 
 			      <child>
-				<widget class="GtkLabel" id="label14">
+				<widget class="GtkLabel" id="monitored_entry">
 				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Entry</property>
+				  <property name="label" translatable="yes">XXXXXXXX</property>
 				  <property name="use_underline">False</property>
-				  <property name="use_markup">True</property>
+				  <property name="use_markup">False</property>
 				  <property name="justify">GTK_JUSTIFY_LEFT</property>
 				  <property name="wrap">False</property>
 				  <property name="selectable">False</property>
@@ -604,88 +496,52 @@
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
 				</widget>
-				<packing>
-				  <property name="type">label_item</property>
-				</packing>
 			      </child>
 			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
 			  </child>
 
 			  <child>
-			    <widget class="GtkFrame" id="frame3">
+			    <widget class="GtkLabel" id="label14">
 			      <property name="visible">True</property>
-			      <property name="label_xalign">0</property>
-			      <property name="label_yalign">0.5</property>
-			      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-			      <child>
-				<widget class="GtkAlignment" id="alignment2">
-				  <property name="border_width">2</property>
-				  <property name="visible">True</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xscale">1</property>
-				  <property name="yscale">1</property>
-				  <property name="top_padding">0</property>
-				  <property name="bottom_padding">0</property>
-				  <property name="left_padding">12</property>
-				  <property name="right_padding">4</property>
-
-				  <child>
-				    <widget class="GtkLabel" id="latest_entrycsn">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">XXXXXXXX</property>
-				      <property name="use_underline">False</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_LEFT</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">0.5</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="label16">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Latest entryCSN</property>
-				  <property name="use_underline">False</property>
-				  <property name="use_markup">True</property>
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				</widget>
-				<packing>
-				  <property name="type">label_item</property>
-				</packing>
-			      </child>
+			      <property name="label" translatable="yes">Entry</property>
+			      <property name="use_underline">False</property>
+			      <property name="use_markup">True</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
 			    </widget>
 			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
+			      <property name="type">label_item</property>
 			    </packing>
 			  </child>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
 			</packing>
 		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkVBox" id="vbox5">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">0</property>
+
+		      <child>
+			<placeholder/>
+		      </child>
 
 		      <child>
 			<widget class="GtkScrolledWindow" id="scrolledwindow2">
@@ -731,7 +587,7 @@
 	      <child>
 		<widget class="GtkLabel" id="label7">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Entry Monitor</property>
+		  <property name="label" translatable="yes">Replication Test</property>
 		  <property name="use_underline">False</property>
 		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
===================================================================
RCS file: demo/haviewer/haviewer.rb,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- demo/haviewer/haviewer.rb	2004/09/10 10:36:05	1.26
+++ demo/haviewer/haviewer.rb	2004/09/10 11:40:28	1.27
@@ -353,11 +353,10 @@
 EOF
 	  }
 	  UltraPossumHost.update_latest_entryCSN
-#          @glade["latest_entrycsn"].set_text(UltraPossumHost::latest_entryCSN)
-	  UltraPossumHosts.each do |host|
-	    host.monitor_entry
-	  end
 	  UltraPossumHosts.each do |host|
+	    # host.monitor_entry
+	    host.repl_sign.off
+	    host.entryCSN = ""
 	    update(host)
 	  end
 	end
@@ -389,7 +388,7 @@
             @list.set_value(@row[host], 3, host.entryCSN)
 	  end
           @glade["monitored_entry"].set_text(UltraPossumHost::monitored_entry)
-          @glade["latest_entrycsn"].set_text(UltraPossumHost::latest_entryCSN)
+  #        @glade["latest_entrycsn"].set_text(UltraPossumHost::latest_entryCSN)
 	end
 
       end


From taru ¡÷ users.sourceforge.jp  Fri Sep 10 20:44:00 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 10 Sep 2004 20:44:00 +0900
Subject: [Ultrapossum-cvs 382] demo/haviewer 1.14,1.15,haviewer.glade
Message-ID: <20040910114400.C35BE2AC019@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/haviewer.glade,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- demo/haviewer/haviewer.glade	2004/09/10 11:40:28	1.14
+++ demo/haviewer/haviewer.glade	2004/09/10 11:44:00	1.15
@@ -372,6 +372,7 @@
 		      <child>
 			<widget class="GtkButton" id="button4">
 			  <property name="visible">True</property>
+			  <property name="sensitive">False</property>
 			  <property name="can_focus">True</property>
 			  <property name="label">gtk-refresh</property>
 			  <property name="use_stock">True</property>


From taru ¡÷ users.sourceforge.jp  Fri Sep 10 21:15:26 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 10 Sep 2004 21:15:26 +0900
Subject: [Ultrapossum-cvs 383] demo/haviewer 1.15, 1.16, haviewer.glade 1.27,
	1.28, haviewer.rb
Message-ID: <20040910121526.101E52AC019@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/haviewer.glade,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- demo/haviewer/haviewer.glade	2004/09/10 11:44:00	1.15
+++ demo/haviewer/haviewer.glade	2004/09/10 12:15:25	1.16
@@ -391,69 +391,11 @@
 			<widget class="GtkButton" id="entry_update">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
+			  <property name="label">gtk-execute</property>
+			  <property name="use_stock">True</property>
 			  <property name="relief">GTK_RELIEF_NORMAL</property>
 			  <property name="focus_on_click">True</property>
 			  <signal name="clicked" handler="on_entry_update_clicked" last_modification_time="Fri, 10 Sep 2004 09:30:03 GMT"/>
-
-			  <child>
-			    <widget class="GtkAlignment" id="alignment3">
-			      <property name="visible">True</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xscale">0</property>
-			      <property name="yscale">0</property>
-			      <property name="top_padding">0</property>
-			      <property name="bottom_padding">0</property>
-			      <property name="left_padding">0</property>
-			      <property name="right_padding">0</property>
-
-			      <child>
-				<widget class="GtkHBox" id="hbox10">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">2</property>
-
-				  <child>
-				    <widget class="GtkImage" id="image3">
-				      <property name="visible">True</property>
-				      <property name="stock">gtk-execute</property>
-				      <property name="icon_size">4</property>
-				      <property name="xalign">0.5</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="label18">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Test!</property>
-				      <property name="use_underline">True</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_LEFT</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">0.5</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-				</widget>
-			      </child>
-			    </widget>
-			  </child>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
===================================================================
RCS file: demo/haviewer/haviewer.rb,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- demo/haviewer/haviewer.rb	2004/09/10 11:40:28	1.27
+++ demo/haviewer/haviewer.rb	2004/09/10 12:15:25	1.28
@@ -128,6 +128,8 @@
 
     class UltraPossum < View
   
+      Conf = ::UltraPossum::Config.new
+
       class UltraPossumHost < Host
 
         OID = "private.12345"  # .2.101.1"
@@ -136,7 +138,7 @@
         OID_SINCE = OID + ".1.3.0"
 
         @@latest_entryCSN = ""
-	@@monitored_entry = "cn=u0001,o=ultrapossum"
+	@@monitored_entry = "cn=u0001,#{Conf["SUFFIX"]}"
 
         def UltraPossumHost.update_latest_entryCSN
 	  `ldapsearch -l 1 -x -h #{Conf["LDAPMASTER"]} -b #{@@monitored_entry} -s base -LLL +`.each_line do |line|
@@ -240,7 +242,6 @@
 
       end
 
-      Conf = ::UltraPossum::Config.new
       UltraPossumHosts = []
       begin
         hash = {}


From taru ¡÷ users.sourceforge.jp  Fri Sep 10 21:37:39 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 10 Sep 2004 21:37:39 +0900
Subject: [Ultrapossum-cvs 384] demo/haviewer 1.16,1.17,haviewer.glade
Message-ID: <20040910123739.969FC2AC019@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/haviewer.glade,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- demo/haviewer/haviewer.glade	2004/09/10 12:15:25	1.16
+++ demo/haviewer/haviewer.glade	2004/09/10 12:37:39	1.17
@@ -12,6 +12,7 @@
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="icon">possumx2.gif</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>


From taru ¡÷ users.sourceforge.jp  Sat Sep 11 11:16:56 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Sat, 11 Sep 2004 11:16:56 +0900
Subject: [Ultrapossum-cvs 385] plugin/snmp/snmppass.d 1.10,1.11,snmpgen
Message-ID: <20040911021656.2C78E2AC019@users.sourceforge.jp>

===================================================================
RCS file: plugin/snmp/snmppass.d/snmpgen,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plugin/snmp/snmppass.d/snmpgen	2004/07/08 12:10:08	1.10
+++ plugin/snmp/snmppass.d/snmpgen	2004/09/11 02:16:56	1.11
@@ -69,6 +69,10 @@
         if failover; then
           echo "FAOVER"
         else
+	  if $MODULEDIR/server/pid status $SLAPD_SLAVE_PIDFILE 2>&1 | grep 'W:' > /dev/null; then
+	    echo "DEAD"
+	    exit 0
+	  fi
 	  echo "STOP"
         fi
 	exit 0


From taru ¡÷ users.sourceforge.jp  Sat Sep 11 11:37:53 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Sat, 11 Sep 2004 11:37:53 +0900
Subject: [Ultrapossum-cvs 386] ultrapossum/module/server 1.20,1.21,2.0
Message-ID: <20040911023753.F0AF12AC03D@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/server/2.0,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ultrapossum/module/server/2.0	2004/08/04 17:08:31	1.20
+++ ultrapossum/module/server/2.0	2004/09/11 02:37:53	1.21
@@ -20,6 +20,17 @@
 slurpdlog="$localstatedir/lib/$PACKAGE/slurpd.log.fifo"
 slurpdlogpid="$localstatedir/run/ultrapossum.slurpd.logger"
 
+# FIXME: little ad-hoc?
+dbrecover() {
+  if test "x`getvalue $DIRECTORY/ultrapossum-environ SLAPD_BACKEND_DB_TYPE`" = "xbdb"; then
+    if test "x`getvalue $DIRECTORY/ultrapossum-environ SLAPD_BERKLEYDB_SONAME`" = "xlibdb-4.2.so"; then
+      if test -x "/usr/bin/db4.2_recover"; then
+        /usr/bin/db4.2_recover -v -h $DIRECTORY
+      fi
+    fi
+  fi
+}
+
 ldapmaster_start() {
 
     # we kill slave slapd
@@ -27,6 +38,8 @@
       echo -n "(stopping "; ldapslave_stop; echo -n ")"
     fi
 
+    dbrecover
+
     # now we will attempt to start as a master
     if ! $SLAPD -h "$SLAPDURILIST" -f $SLAPDMASTERCONF $SLAPD_EXTRA_ARGS; then
       echo "E: $SLAPD abnormally exits. Probably you can see the error by syslog" 1>&2
@@ -109,6 +122,7 @@
 }
 
 ldapslave_start() {
+  dbrecover
   $SLAPD -h "$SLAPDURILIST" $SLAPD_EXTRA_ARGS
   $MODULEDIR/server/pid wait  $CHROOTDIRECTORY/$SLAPD_SLAVE_PIDFILE
   echo -n "`basename $SLAPD`"


From taru ¡÷ users.sourceforge.jp  Sat Sep 11 23:52:16 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Sat, 11 Sep 2004 23:52:16 +0900
Subject: [Ultrapossum-cvs 387] demo/haviewer/lib NONE,1.1,ultrapossum.rb
Message-ID: <20040911145216.4ECAC2AC03E@users.sourceforge.jp>



From taru ¡÷ users.sourceforge.jp  Sat Sep 11 23:52:16 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Sat, 11 Sep 2004 23:52:16 +0900
Subject: [Ultrapossum-cvs 388] demo/haviewer 1.28, NONE, haviewer.rb 1.1, NONE,
	ultrapossum.rb
Message-ID: <20040911145216.35C8A2AC010@users.sourceforge.jp>



From taru ¡÷ users.sourceforge.jp  Sat Sep 11 23:52:16 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Sat, 11 Sep 2004 23:52:16 +0900
Subject: [Ultrapossum-cvs 389] demo/haviewer/lib/haviewer ...
Message-ID: <20040911145216.6AEC22AC047@users.sourceforge.jp>



From taru ¡÷ users.sourceforge.jp  Sat Sep 11 23:56:07 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Sat, 11 Sep 2004 23:56:07 +0900
Subject: [Ultrapossum-cvs 389] demo/haviewer/debian ...
Message-ID: <20040911145607.8424B2AC010@users.sourceforge.jp>



From taru ¡÷ users.sourceforge.jp  Sat Sep 11 23:56:32 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Sat, 11 Sep 2004 23:56:32 +0900
Subject: [Ultrapossum-cvs 390] demo/haviewer 1.2,1.3,haviewer
Message-ID: <20040911145632.C77732AC010@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/haviewer,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- demo/haviewer/haviewer	2004/06/18 05:39:58	1.2
+++ demo/haviewer/haviewer	2004/09/11 14:56:32	1.3
@@ -1,8 +1,12 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
-eval `ultrapossum-config init`
-trap "eval `ultrapossum-config term`" 0
+set -e
 
-./$0.pl
+SHAREDIR=/usr/share/haviewer
 
+if test -f "lib/haviewer/haviewer.rb"; then
+  SHAREDIR=`pwd`
+fi
+
+ruby -I$SHAREDIR/lib $SHAREDIR/lib/haviewer/haviewer.rb $SHAREDIR/haviewer.glade
 


From taru ¡÷ users.sourceforge.jp  Sun Sep 12 00:00:33 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Sun, 12 Sep 2004 00:00:33 +0900
Subject: [Ultrapossum-cvs 391] demo/haviewer/debian NONE, 1.1, compat 1.1, 1.2,
	rules
Message-ID: <20040911150033.D77E52AC010@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/debian/rules,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- demo/haviewer/debian/rules	2004/09/11 14:56:07	1.1
+++ demo/haviewer/debian/rules	2004/09/11 15:00:33	1.2
@@ -56,7 +56,7 @@
 	# $(MAKE) install DESTDIR=$(CURDIR)/debian/haviewer
 	install -m 755 haviewer $(CURDIR)/debian/haviewer/usr/bin/
 	/bin/cp -r lib $(CURDIR)/debian/haviewer/usr/share/haviewer/
-	find . -type d | grep CVS | xargs /bin/rm -r
+	find $(CURDIR)/debian/haviewer/ -type d | grep CVS | xargs /bin/rm -r
 	install -m 644 haviewer.glade $(CURDIR)/debian/haviewer/usr/share/haviewer/
 	install -m 644 *.gif $(CURDIR)/debian/haviewer/usr/share/haviewer/
 


From taru ¡÷ users.sourceforge.jp  Sun Sep 12 00:31:13 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Sun, 12 Sep 2004 00:31:13 +0900
Subject: [Ultrapossum-cvs 392] demo/haviewer/lib/haviewer 1.1, 1.2,
	ultrapossum.rb
Message-ID: <20040911153113.D02632AC010@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/lib/haviewer/ultrapossum.rb,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- demo/haviewer/lib/haviewer/ultrapossum.rb	2004/09/11 14:52:16	1.1
+++ demo/haviewer/lib/haviewer/ultrapossum.rb	2004/09/11 15:31:13	1.2
@@ -227,13 +227,17 @@
       def entry_update
         open("|ldapmodify -x -h #{Conf["LDAPMASTER"]} -D #{Conf["ROOTDN"]} -w #{Conf["ROOTPW"]} > /dev/null", "w") { |io|
           date=`sh -c 'LANG=C date'`
-          io.puts <<EOF
+          begin
+            io.puts <<EOF
 dn: #{UltraPossumHost::monitored_entry}
 changetype: modify
 replace: description
 description: #{date}
 EOF
+          rescue
+          end
         }
+        $stderr.puts "error" if $? != 0
         UltraPossumHost.update_latest_entryCSN
         UltraPossumHosts.each do |host|
           # host.monitor_entry


From taru ¡÷ users.sourceforge.jp  Mon Sep 13 12:16:03 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Mon, 13 Sep 2004 12:16:03 +0900
Subject: [Ultrapossum-cvs 393] demo/haviewer 1.17,1.18,haviewer.glade
Message-ID: <20040913031603.AC5152AC01F@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/haviewer.glade,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- demo/haviewer/haviewer.glade	2004/09/10 12:37:39	1.17
+++ demo/haviewer/haviewer.glade	2004/09/13 03:16:03	1.18
@@ -615,4 +615,105 @@
   </child>
 </widget>
 
+<widget class="GtkDialog" id="entry_update_error">
+  <property name="title" translatable="yes">Failed to modify entry</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">True</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="has_separator">True</property>
+
+  <child internal-child="vbox">
+    <widget class="GtkVBox" id="dialog-vbox2">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">0</property>
+
+      <child internal-child="action_area">
+	<widget class="GtkHButtonBox" id="dialog-action_area2">
+	  <property name="visible">True</property>
+	  <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+	  <child>
+	    <widget class="GtkButton" id="entry_update_error_ok">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-ok</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-5</property>
+	      <signal name="clicked" handler="on_entry_update_error_ok_clicked" last_modification_time="Mon, 13 Sep 2004 02:55:28 GMT"/>
+	    </widget>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">True</property>
+	  <property name="pack_type">GTK_PACK_END</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkFrame" id="frame3">
+	  <property name="visible">True</property>
+	  <property name="label_xalign">0</property>
+	  <property name="label_yalign">0.5</property>
+	  <property name="shadow_type">GTK_SHADOW_NONE</property>
+
+	  <child>
+	    <widget class="GtkAlignment" id="alignment2">
+	      <property name="visible">True</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xscale">1</property>
+	      <property name="yscale">1</property>
+	      <property name="top_padding">0</property>
+	      <property name="bottom_padding">0</property>
+	      <property name="left_padding">12</property>
+	      <property name="right_padding">0</property>
+
+	      <child>
+		<placeholder/>
+	      </child>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="entry_update_error_label">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">&lt;b&gt;Can't modify entry&lt;/b&gt;</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">True</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	    </widget>
+	    <packing>
+	      <property name="type">label_item</property>
+	    </packing>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+    </widget>
+  </child>
+</widget>
+
 </glade-interface>


From taru ¡÷ users.sourceforge.jp  Mon Sep 13 12:16:03 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Mon, 13 Sep 2004 12:16:03 +0900
Subject: [Ultrapossum-cvs 394] demo/haviewer/lib/haviewer ...
Message-ID: <20040913031603.C9E3B2AC020@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/lib/haviewer/haviewer.rb,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- demo/haviewer/lib/haviewer/haviewer.rb	2004/09/11 14:52:16	1.1
+++ demo/haviewer/lib/haviewer/haviewer.rb	2004/09/13 03:16:03	1.2
@@ -16,6 +16,10 @@
   $haview.views["entry"].entry_update
 end
 
+def on_entry_update_error_ok_clicked
+  $haview.glade["entry_update_error"].hide
+end
+
 class HAViewer
 
   Hosts = []
===================================================================
RCS file: demo/haviewer/lib/haviewer/ultrapossum.rb,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- demo/haviewer/lib/haviewer/ultrapossum.rb	2004/09/11 15:31:13	1.2
+++ demo/haviewer/lib/haviewer/ultrapossum.rb	2004/09/13 03:16:03	1.3
@@ -1,3 +1,4 @@
+require 'open3'
 require 'ultrapossum'
 
 class HAViewer
@@ -225,10 +226,10 @@
     class EntryView < View
 
       def entry_update
-        open("|ldapmodify -x -h #{Conf["LDAPMASTER"]} -D #{Conf["ROOTDN"]} -w #{Conf["ROOTPW"]} > /dev/null", "w") { |io|
+        open("|ldapmodify -x -h #{Conf["LDAPMASTER"]} -D #{Conf["ROOTDN"]} -w #{Conf["ROOTPW"]} 2>&1") { |io|
           date=`sh -c 'LANG=C date'`
           begin
-            io.puts <<EOF
+            io[0].puts <<EOF
 dn: #{UltraPossumHost::monitored_entry}
 changetype: modify
 replace: description
@@ -236,8 +237,11 @@
 EOF
           rescue
           end
+          @glade["entry_update_error_label"].set_text(io.read)
         }
-        $stderr.puts "error" if $? != 0
+        if $? != 0
+          @glade["entry_update_error"].show if $? != 0
+        end
         UltraPossumHost.update_latest_entryCSN
         UltraPossumHosts.each do |host|
           # host.monitor_entry


From taru ¡÷ users.sourceforge.jp  Mon Sep 13 13:10:13 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Mon, 13 Sep 2004 13:10:13 +0900
Subject: [Ultrapossum-cvs 395] demo/haviewer/lib/haviewer 1.3, 1.4,
	ultrapossum.rb
Message-ID: <20040913041013.5E4642AC01F@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/lib/haviewer/ultrapossum.rb,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- demo/haviewer/lib/haviewer/ultrapossum.rb	2004/09/13 03:16:03	1.3
+++ demo/haviewer/lib/haviewer/ultrapossum.rb	2004/09/13 04:10:13	1.4
@@ -226,19 +226,40 @@
     class EntryView < View
 
       def entry_update
-        open("|ldapmodify -x -h #{Conf["LDAPMASTER"]} -D #{Conf["ROOTDN"]} -w #{Conf["ROOTPW"]} 2>&1") { |io|
-          date=`sh -c 'LANG=C date'`
-          begin
-            io[0].puts <<EOF
+
+        pw = IO::pipe
+        pe = IO::pipe
+
+        pid = fork {
+          pw[1].close
+          STDIN.reopen(pw[0])
+          pw[0].close
+
+          pe[0].close
+          STDERR.reopen(pe[1])
+          pe[1].close
+
+          exec("ldapmodify -x -h #{Conf["LDAPMASTER"]} -D #{Conf["ROOTDN"]} -w #{Conf["ROOTPW"]}")
+        }
+
+        pw[0].close
+        pe[1].close
+
+        date=`sh -c 'LANG=C date'`
+        begin
+          pw[1].puts <<EOF
 dn: #{UltraPossumHost::monitored_entry}
 changetype: modify
 replace: description
 description: #{date}
+
 EOF
-          rescue
-          end
-          @glade["entry_update_error_label"].set_text(io.read)
-        }
+          pw[1].close
+        rescue
+        end
+        @glade["entry_update_error_label"].set_text(pe[0].gets)
+        pe[0].close
+        Process.waitpid(pid)
         if $? != 0
           @glade["entry_update_error"].show if $? != 0
         end


From taru ¡÷ users.sourceforge.jp  Mon Sep 13 13:35:20 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Mon, 13 Sep 2004 13:35:20 +0900
Subject: [Ultrapossum-cvs 396] demo/haviewer/lib/haviewer 1.4, 1.5,
	ultrapossum.rb
Message-ID: <20040913043520.B28272AC01F@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/lib/haviewer/ultrapossum.rb,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- demo/haviewer/lib/haviewer/ultrapossum.rb	2004/09/13 04:10:13	1.4
+++ demo/haviewer/lib/haviewer/ultrapossum.rb	2004/09/13 04:35:20	1.5
@@ -144,7 +144,6 @@
         Conf["SLAVES"].split(' ').each do |s|
           host = UltraPossumHost.new(s,"slave")
           if hash[s].nil?
-            @row[host] = @list.append
             UltraPossumHosts << host
             Hosts << host
             hash[s] = host
@@ -257,18 +256,19 @@
           pw[1].close
         rescue
         end
-        @glade["entry_update_error_label"].set_text(pe[0].gets)
+        @glade["entry_update_error_label"].set_text("#{pe[0].gets}")
         pe[0].close
         Process.waitpid(pid)
         if $? != 0
           @glade["entry_update_error"].show if $? != 0
-        end
-        UltraPossumHost.update_latest_entryCSN
-        UltraPossumHosts.each do |host|
-          # host.monitor_entry
-          host.repl_sign.off
-          host.entryCSN = ""
-          update(host)
+        else
+          UltraPossumHost.update_latest_entryCSN
+          UltraPossumHosts.each do |host|
+            # host.monitor_entry
+            host.repl_sign.off
+            host.entryCSN = ""
+            update(host)
+          end
         end
       end
 


From taru ¡÷ users.sourceforge.jp  Mon Sep 13 13:37:11 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Mon, 13 Sep 2004 13:37:11 +0900
Subject: [Ultrapossum-cvs 397] plugin/slapd/debian 1.3,1.4,control
Message-ID: <20040913043711.2E1BF2AC01F@users.sourceforge.jp>

===================================================================
RCS file: plugin/slapd/debian/control,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin/slapd/debian/control	2004/07/16 06:41:34	1.3
+++ plugin/slapd/debian/control	2004/09/13 04:37:11	1.4
@@ -7,7 +7,7 @@
 
 Package: ultrapossum-slapd
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, db4.2-util
 Provides: slapd
 Conflicts: ultrapossum-server (<< 0.1beta6-0pre11)
 Description: UltraPossum plugin to use slapd optimized for UltraPossum


From taru ¡÷ users.sourceforge.jp  Mon Sep 13 13:58:17 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Mon, 13 Sep 2004 13:58:17 +0900
Subject: [Ultrapossum-cvs 398] ultrapossum/debian 1.44,1.45,changelog
Message-ID: <20040913045817.030A02AC013@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/changelog,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ultrapossum/debian/changelog	2004/09/07 12:17:50	1.44
+++ ultrapossum/debian/changelog	2004/09/13 04:58:16	1.45
@@ -1,3 +1,10 @@
+ultrapossum (0.1beta7-0pre7) unstable; urgency=low
+
+  * Applied the latest upstream version.
+     - add dbrecover
+
+ -- Masato Taruishi <taru ¡÷ valinux.co.jp>  Mon, 13 Sep 2004 13:56:21 +0900
+
 ultrapossum (0.1beta7-0pre6.1) unstable; urgency=low
 
   * Applied the latest upstream version.


From taru ¡÷ users.sourceforge.jp  Mon Sep 13 14:04:59 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Mon, 13 Sep 2004 14:04:59 +0900
Subject: [Ultrapossum-cvs 399] demo/haviewer/lib/haviewer 1.5, 1.6,
	ultrapossum.rb
Message-ID: <20040913050459.EC43B2AC013@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/lib/haviewer/ultrapossum.rb,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- demo/haviewer/lib/haviewer/ultrapossum.rb	2004/09/13 04:35:20	1.5
+++ demo/haviewer/lib/haviewer/ultrapossum.rb	2004/09/13 05:04:59	1.6
@@ -256,7 +256,7 @@
           pw[1].close
         rescue
         end
-        @glade["entry_update_error_label"].set_text("#{pe[0].gets}")
+        @glade["entry_update_error_label"].set_text("#{pe[0].read}")
         pe[0].close
         Process.waitpid(pid)
         if $? != 0


From taru ¡÷ users.sourceforge.jp  Mon Sep 13 22:00:41 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Mon, 13 Sep 2004 22:00:41 +0900
Subject: [Ultrapossum-cvs 400] demo/haviewer/lib/haviewer 1.6, 1.7,
	ultrapossum.rb
Message-ID: <20040913130041.752462AC022@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/lib/haviewer/ultrapossum.rb,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- demo/haviewer/lib/haviewer/ultrapossum.rb	2004/09/13 05:04:59	1.6
+++ demo/haviewer/lib/haviewer/ultrapossum.rb	2004/09/13 13:00:41	1.7
@@ -26,10 +26,10 @@
         end
         UltraPossumHosts.each do |host|
           case host.entryCSN
-          when @@latest_entryCSN
-            host.repl_sign.on(Green)
           when ""
             host.repl_sign.off
+          when @@latest_entryCSN
+            host.repl_sign.on(Green)
           else
             host.repl_sign.on(Yellow)
           end
@@ -63,12 +63,11 @@
             @entryCSN = $1
           end
         end
-        #	  UltraPossumHost.update_latest_entryCSN
         case @entryCSN
-        when @@latest_entryCSN
-          @repl_sign.on(Green)
         when ""
           @repl_sign.off
+        when @@latest_entryCSN
+          @repl_sign.on(Green)
         else
           @repl_sign.on(Red)
         end


From taru ¡÷ users.sourceforge.jp  Tue Sep 14 20:01:43 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 14 Sep 2004 20:01:43 +0900
Subject: [Ultrapossum-cvs 401] demo/haviewer/lib/haviewer 1.2,1.3,haviewer.rb
Message-ID: <20040914110143.AE3042AC025@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/lib/haviewer/haviewer.rb,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- demo/haviewer/lib/haviewer/haviewer.rb	2004/09/13 03:16:03	1.2
+++ demo/haviewer/lib/haviewer/haviewer.rb	2004/09/14 11:01:43	1.3
@@ -163,6 +163,7 @@
 $haview = HAViewer.new(ARGV[0])
 $haview.add_view( "status", HAViewer::UltraPossum.new($haview) )
 $haview.add_view( "entry", HAViewer::UltraPossum::EntryView.new($haview) )
+$haview.glade["dialog1"].set_title(  "UltraPossum HA Viewer (#{HAViewer::UltraPossum::Conf["ORGANIZATION"]})" )
 $haview.update
 HAViewer::Hosts.each do |host|
   $haview.views.each do |name,view|


From taru ¡÷ users.sourceforge.jp  Wed Sep 15 16:21:51 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 15 Sep 2004 16:21:51 +0900
Subject: [Ultrapossum-cvs 402] plugin/slapd/debian 1.4,1.5,control
Message-ID: <20040915072151.19A762AC01A@users.sourceforge.jp>

===================================================================
RCS file: plugin/slapd/debian/control,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin/slapd/debian/control	2004/09/13 04:37:11	1.4
+++ plugin/slapd/debian/control	2004/09/15 07:21:50	1.5
@@ -2,7 +2,7 @@
 Section: net
 Priority: optional
 Maintainer: Masato Taruishi <taru ¡÷ valinux.co.jp>
-Build-Depends: debhelper (>= 4.0.0)
+Build-Depends: debhelper (>= 4.0.0), libdb4.2-dev, libsasl2-dev, libssl-dev
 Standards-Version: 3.6.0
 
 Package: ultrapossum-slapd


From taru ¡÷ users.sourceforge.jp  Wed Sep 15 16:22:09 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 15 Sep 2004 16:22:09 +0900
Subject: [Ultrapossum-cvs 403] plugin/slapd 1.1,1.2,Makefile.am
Message-ID: <20040915072209.24C802AC01A@users.sourceforge.jp>

===================================================================
RCS file: plugin/slapd/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin/slapd/Makefile.am	2004/06/24 08:29:38	1.1
+++ plugin/slapd/Makefile.am	2004/09/15 07:22:09	1.2
@@ -14,5 +14,5 @@
 
 EXTRA_DIST = \
 	update-slapd \
-	09slapd
-
+	09slapd \
+        ultrapossum.am


From taru ¡÷ users.sourceforge.jp  Wed Sep 15 16:23:46 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 15 Sep 2004 16:23:46 +0900
Subject: [Ultrapossum-cvs 404] plugin/slapd ...
Message-ID: <20040915072346.687C32AC01A@users.sourceforge.jp>



From taru ¡÷ users.sourceforge.jp  Wed Sep 15 17:18:21 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 15 Sep 2004 17:18:21 +0900
Subject: [Ultrapossum-cvs 405] plugin/slapd 1.2, 1.3, Makefile.am 1.1, 1.2,
	configure.in
Message-ID: <20040915081821.586502AC02B@users.sourceforge.jp>

===================================================================
RCS file: plugin/slapd/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin/slapd/Makefile.am	2004/09/15 07:22:09	1.2
+++ plugin/slapd/Makefile.am	2004/09/15 08:18:21	1.3
@@ -1,4 +1,6 @@
 
+SUBDIRS = upstream
+
 modulename = slapd
 include ultrapossum.am
 
@@ -10,7 +12,7 @@
 #templatedir = $(sysconfdir)/ultrapossum/in.d
 #template_DATA = snmpd.conf.in
 
-#modulelocal_DATA = snmpgen.in
+#modulelocal_DATA
 
 EXTRA_DIST = \
 	update-slapd \
===================================================================
RCS file: plugin/slapd/configure.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin/slapd/configure.in	2004/06/24 08:29:38	1.1
+++ plugin/slapd/configure.in	2004/09/15 08:18:21	1.2
@@ -2,8 +2,8 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.50)
-AC_INIT(ultrapossum-slapd, 0.0.1, taru ¡÷ ultrapossum.org)
-AM_INIT_AUTOMAKE(ultrapossum-slapd, 0.0.1+2.2.14)
+AC_INIT(ultrapossum-slapd, 0.0.1+2.2.14sb1, taru ¡÷ ultrapossum.org)
+AM_INIT_AUTOMAKE(ultrapossum-slapd, 0.0.1+2.2.14sb1)
 
 # Checks for programs.
 AC_PROG_LN_S
@@ -16,5 +16,5 @@
 
 # Checks for library functions.
 
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile upstream/Makefile])
 AC_OUTPUT


From taru ¡÷ users.sourceforge.jp  Wed Sep 15 17:18:21 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 15 Sep 2004 17:18:21 +0900
Subject: [Ultrapossum-cvs 406] plugin/slapd/debian 1.2,1.3,rules
Message-ID: <20040915081821.6722F2AC02F@users.sourceforge.jp>

===================================================================
RCS file: plugin/slapd/debian/rules,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin/slapd/debian/rules	2004/08/27 09:26:05	1.2
+++ plugin/slapd/debian/rules	2004/09/15 08:18:21	1.3
@@ -26,8 +26,7 @@
 configure-stamp:
 	dh_testdir
 	# Add here commands to configure the package.
-	./configure --prefix=/usr --sysconfdir=/etc
-	install -d debian/upstream/build-tree && cd debian/upstream/build-tree && tar zxf ../openldap-$(OPENLDAP_VERSION).tgz && cd openldap-$(OPENLDAP_VERSION) && patch -p1 < ../../syncbackup-$(OPENLDAP_VERSION).patch && chmod 755 tests/scripts/test101-syncbackup && ./configure --prefix=/usr/share/ultrapossum/module.d/slapd --sysconfdir=/etc/ultrapossum/slapd --localstatedir=/var/lib/ultrapossum/slapd/
+	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
 
 	touch configure-stamp
 
@@ -39,8 +38,6 @@
 
 	# Add here commands to compile the package.
 	$(MAKE)
-	$(MAKE) -C debian/upstream/build-tree/openldap-$(OPENLDAP_VERSION)
-	$(MAKE) -C debian/upstream/build-tree/openldap-$(OPENLDAP_VERSION) test
 
 	touch build-stamp
 
@@ -63,7 +60,6 @@
 
 	# Add here commands to install the package into debian/ultrapossum-slapd.
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/ultrapossum-slapd
-	$(MAKE) -C debian/upstream/build-tree/openldap-$(OPENLDAP_VERSION) install DESTDIR=$(CURDIR)/debian/ultrapossum-slapd
 	/bin/rm -r $(CURDIR)/debian/ultrapossum-slapd/usr/share/ultrapossum/module.d/slapd/man
 	/bin/rm -r $(CURDIR)/debian/ultrapossum-slapd/usr/share/ultrapossum/module.d/slapd/include
 	/bin/rm -r $(CURDIR)/debian/ultrapossum-slapd/usr/share/ultrapossum/module.d/slapd/bin


From taru ¡÷ users.sourceforge.jp  Wed Sep 15 17:18:21 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 15 Sep 2004 17:18:21 +0900
Subject: [Ultrapossum-cvs 407] plugin/slapd/upstream ...
Message-ID: <20040915081821.A8A092AC038@users.sourceforge.jp>



From taru ¡÷ users.sourceforge.jp  Wed Sep 15 17:32:54 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 15 Sep 2004 17:32:54 +0900
Subject: [Ultrapossum-cvs 406] plugin/slapd 1.3,1.4,Makefile.am
Message-ID: <20040915083254.A53052AC01A@users.sourceforge.jp>

===================================================================
RCS file: plugin/slapd/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin/slapd/Makefile.am	2004/09/15 08:18:21	1.3
+++ plugin/slapd/Makefile.am	2004/09/15 08:32:54	1.4
@@ -17,4 +17,5 @@
 EXTRA_DIST = \
 	update-slapd \
 	09slapd \
-        ultrapossum.am
+        ultrapossum.am \
+	autogen.sh


From taru ¡÷ users.sourceforge.jp  Wed Sep 15 17:37:40 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 15 Sep 2004 17:37:40 +0900
Subject: [Ultrapossum-cvs 407] plugin/slapd/upstream 1.1,1.2,Makefile.am
Message-ID: <20040915083740.F301D2AC01A@users.sourceforge.jp>

===================================================================
RCS file: plugin/slapd/upstream/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin/slapd/upstream/Makefile.am	2004/09/15 08:18:21	1.1
+++ plugin/slapd/upstream/Makefile.am	2004/09/15 08:37:40	1.2
@@ -1,9 +1,9 @@
 
 OPENLDAP_VERSION = 2.2.14
 
-all-local: slapd
+all-local: build-upstream
 
-slapd: build-tree/openldap-$(OPENLDAP_VERSION)/config.status
+build-upstream: build-tree/openldap-$(OPENLDAP_VERSION)/config.status
 	$(MAKE) -C build-tree/openldap-$(OPENLDAP_VERSION)
 
 build-tree/openldap-$(OPENLDAP_VERSION)/config.status:
@@ -19,4 +19,6 @@
 	/bin/rm -rf build-tree
 
 
-EXTRA_DIST = openldap-$(OPENLDAP_VERSION).tgz syncbackup-2.2.14.patch
\ No newline at end of file
+EXTRA_DIST = openldap-$(OPENLDAP_VERSION).tgz syncbackup-2.2.14.patch
+
+.PHONY: build-upstream


From taru ¡÷ users.sourceforge.jp  Wed Sep 15 17:56:09 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 15 Sep 2004 17:56:09 +0900
Subject: [Ultrapossum-cvs 408] plugin/slapd/debian 1.3,1.4,rules
Message-ID: <20040915085609.B9D572AC01A@users.sourceforge.jp>

===================================================================
RCS file: plugin/slapd/debian/rules,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin/slapd/debian/rules	2004/09/15 08:18:21	1.3
+++ plugin/slapd/debian/rules	2004/09/15 08:56:09	1.4
@@ -48,7 +48,6 @@
 
 	# Add here commands to clean up after the build process.
 	-$(MAKE) clean
-	/bin/rm -rf debian/upstream/build-tree
 
 	dh_clean 
 
@@ -60,10 +59,10 @@
 
 	# Add here commands to install the package into debian/ultrapossum-slapd.
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/ultrapossum-slapd
-	/bin/rm -r $(CURDIR)/debian/ultrapossum-slapd/usr/share/ultrapossum/module.d/slapd/man
-	/bin/rm -r $(CURDIR)/debian/ultrapossum-slapd/usr/share/ultrapossum/module.d/slapd/include
-	/bin/rm -r $(CURDIR)/debian/ultrapossum-slapd/usr/share/ultrapossum/module.d/slapd/bin
-	/bin/rm -r $(CURDIR)/debian/ultrapossum-slapd/etc/ultrapossum/slapd/openldap/ldap.conf*
+	/bin/rm -fr $(CURDIR)/debian/ultrapossum-slapd/usr/share/ultrapossum/module.d/slapd/man
+	/bin/rm -fr $(CURDIR)/debian/ultrapossum-slapd/usr/share/ultrapossum/module.d/slapd/include
+	/bin/rm -fr $(CURDIR)/debian/ultrapossum-slapd/usr/share/ultrapossum/module.d/slapd/bin
+	/bin/rm -fr $(CURDIR)/debian/ultrapossum-slapd/etc/ultrapossum/slapd/openldap/ldap.conf*
 
 # Build architecture-independent files here.
 binary-indep: build install


From taru ¡÷ users.sourceforge.jp  Wed Sep 15 17:56:09 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 15 Sep 2004 17:56:09 +0900
Subject: [Ultrapossum-cvs 409] plugin/slapd/upstream 1.2,1.3,Makefile.am
Message-ID: <20040915085609.CF0242AC02B@users.sourceforge.jp>

===================================================================
RCS file: plugin/slapd/upstream/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin/slapd/upstream/Makefile.am	2004/09/15 08:37:40	1.2
+++ plugin/slapd/upstream/Makefile.am	2004/09/15 08:56:09	1.3
@@ -1,6 +1,8 @@
 
 OPENLDAP_VERSION = 2.2.14
 
+include ../ultrapossum.am
+
 all-local: build-upstream
 
 build-upstream: build-tree/openldap-$(OPENLDAP_VERSION)/config.status
@@ -13,7 +15,7 @@
 	$(MAKE) -C build-tree/openldap-$(OPENLDAP_VERSION) test
 
 install-exec-local:
-	$(MAKE) -C build-tree/openldap-$(OPENLDAP_VERSION) install	
+	$(MAKE) -C build-tree/openldap-$(OPENLDAP_VERSION) install DESTDIR=$(DESTDIR)
 
 clean-local:
 	/bin/rm -rf build-tree


From taru ¡÷ users.sourceforge.jp  Wed Sep 15 18:24:36 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 15 Sep 2004 18:24:36 +0900
Subject: [Ultrapossum-cvs 410] demo/haviewer 1.18,1.19,haviewer.glade
Message-ID: <20040915092436.CBC032AC01A@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/haviewer.glade,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- demo/haviewer/haviewer.glade	2004/09/13 03:16:03	1.18
+++ demo/haviewer/haviewer.glade	2004/09/15 09:24:36	1.19
@@ -546,6 +546,51 @@
 		  <property name="type">tab</property>
 		</packing>
 	      </child>
+
+	      <child>
+		<widget class="GtkScrolledWindow" id="scrolledwindow3">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
+		  <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+		  <property name="shadow_type">GTK_SHADOW_NONE</property>
+		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+		  <child>
+		    <widget class="GtkTreeView" id="treeview3">
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="headers_visible">True</property>
+		      <property name="rules_hint">False</property>
+		      <property name="reorderable">False</property>
+		      <property name="enable_search">True</property>
+		    </widget>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="tab_expand">False</property>
+		  <property name="tab_fill">True</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkLabel" id="label15">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">Config</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		</widget>
+		<packing>
+		  <property name="type">tab</property>
+		</packing>
+	      </child>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>


From taru ¡÷ users.sourceforge.jp  Wed Sep 15 18:24:36 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 15 Sep 2004 18:24:36 +0900
Subject: [Ultrapossum-cvs 411] demo/haviewer/lib/haviewer ...
Message-ID: <20040915092436.E5AA12AC02B@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/lib/haviewer/haviewer.rb,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- demo/haviewer/lib/haviewer/haviewer.rb	2004/09/14 11:01:43	1.3
+++ demo/haviewer/lib/haviewer/haviewer.rb	2004/09/15 09:24:36	1.4
@@ -163,6 +163,7 @@
 $haview = HAViewer.new(ARGV[0])
 $haview.add_view( "status", HAViewer::UltraPossum.new($haview) )
 $haview.add_view( "entry", HAViewer::UltraPossum::EntryView.new($haview) )
+$haview.add_view( "config", HAViewer::UltraPossum::ConfigView.new($haview) )
 $haview.glade["dialog1"].set_title(  "UltraPossum HA Viewer (#{HAViewer::UltraPossum::Conf["ORGANIZATION"]})" )
 $haview.update
 HAViewer::Hosts.each do |host|
===================================================================
RCS file: demo/haviewer/lib/haviewer/ultrapossum.rb,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- demo/haviewer/lib/haviewer/ultrapossum.rb	2004/09/13 13:00:41	1.7
+++ demo/haviewer/lib/haviewer/ultrapossum.rb	2004/09/15 09:24:36	1.8
@@ -303,6 +303,29 @@
 
     end
 
+    class ConfigView < View
+
+      Column = [ "Key", "Value" ]
+      def initialize(haview)
+        super
+        @list = Gtk::ListStore.new( String, String )
+        @columns = []
+        Column.size.times do |i|
+          @columns << Gtk::TreeViewColumn.new(Column[i], Gtk::CellRendererText.new, { :markup => i })
+        end
+        @row = {}
+        Conf.keys.sort.each do |key|
+          @row[key] = @list.append
+          @list.set_value(@row[key], 0, key )
+          @list.set_value(@row[key], 1, Conf[key] )
+        end
+        @columns.each do |val|
+          @glade["treeview3"].append_column(val)
+        end
+        @glade["treeview3"].set_model(@list)
+      end
+    end
+
   end
 
 end


From taru ¡÷ users.sourceforge.jp  Wed Sep 15 18:42:59 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 15 Sep 2004 18:42:59 +0900
Subject: [Ultrapossum-cvs 412] demo/haviewer 1.19,1.20,haviewer.glade
Message-ID: <20040915094259.0F1382AC039@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/haviewer.glade,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- demo/haviewer/haviewer.glade	2004/09/15 09:24:36	1.19
+++ demo/haviewer/haviewer.glade	2004/09/15 09:42:58	1.20
@@ -549,6 +549,7 @@
 
 	      <child>
 		<widget class="GtkScrolledWindow" id="scrolledwindow3">
+		  <property name="border_width">2</property>
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
 		  <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
@@ -576,7 +577,7 @@
 	      <child>
 		<widget class="GtkLabel" id="label15">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Config</property>
+		  <property name="label" translatable="yes">Registry</property>
 		  <property name="use_underline">False</property>
 		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>


From taru ¡÷ users.sourceforge.jp  Wed Sep 15 19:31:05 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 15 Sep 2004 19:31:05 +0900
Subject: [Ultrapossum-cvs 413] ultrapossum/module/server 1.8,1.9,10server
Message-ID: <20040915103105.6E7952AC038@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/server/10server,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ultrapossum/module/server/10server	2004/08/27 08:32:36	1.8
+++ ultrapossum/module/server/10server	2004/09/15 10:31:05	1.9
@@ -89,7 +89,7 @@
 LDAPURILIST=`ultrapossum_getconf LDAPURILIST ldap://:$LDAPLISTENPORT/`
 
 MASTER=`ultrapossum_getconf MASTER $LDAPMASTER`
-SLAPD_VERSION=`strings $SLAPD | grep OpenLDAP: | sed -e 's/.*slapd \([^ ]*\).*$/\1/'`
+SLAPD_VERSION=$(ultrapossum_getconf SLAPD_VERSION `strings $SLAPD 2> /dev/null | grep OpenLDAP: | sed -e 's/.*slapd \([^ ]*\).*$/\1/'`)
 
 if test "x$SLAPD_MAJOR_VERSION" = "x" && test -x $SLAPD; then
   case "$SLAPD_VERSION" in
@@ -159,7 +159,7 @@
 fi
 
 SLAPD_MAJOR_VERSION=`ultrapossum_getconf SLAPD_MAJOR_VERSION 2.0`
-SLAPD_BERKLEYDB_SONAME=$(ultrapossum_getconf SLAPD_BERKLEYDB_SONAME `ldd $SLAPD | grep libdb | awk -F' ' '{print $1;}'`)
+SLAPD_BERKLEYDB_SONAME=$(ultrapossum_getconf SLAPD_BERKLEYDB_SONAME `ldd $SLAPD 2> /dev/null | grep libdb | awk -F' ' '{print $1;}'`)
 
 SLURPDSLAVES=`ultrapossum_getconf SLURPDSLAVES ""`
 REPLICALISTENPORT=`ultrapossum_getconf REPLICALISTENPORT ldap`


From taru ¡÷ users.sourceforge.jp  Wed Sep 15 21:17:50 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 15 Sep 2004 21:17:50 +0900
Subject: [Ultrapossum-cvs 414] ultrapossum ...
Message-ID: <20040915121750.6AFF62AC02B@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ultrapossum/Makefile.am	2004/06/01 05:40:19	1.12
+++ ultrapossum/Makefile.am	2004/09/15 12:17:50	1.13
@@ -1,4 +1,4 @@
-SUBDIRS = test-si module test config
+SUBDIRS = test-si module test config init.d
 
 sbin_SCRIPTS = update-ultrapossum ultrapossum-server
 bin_SCRIPTS = ultrapossum-config
@@ -9,8 +9,13 @@
 aclocaldir = @aclocaldir@
 aclocal_DATA = ultrapossum.m4
 
-variable: modules
+variable: modules init.d/variable Makefile
 	egrep "[A-Z_][A-Z_]*=" modules | cut -d= -f1 | grep -v IFS | tr -d '# ' | sort | uniq > $@
+	sort init.d/variable $@ | uniq >> $@T
+	mv $@T $@
+
+init.d/variable:
+	$(MAKE) -C init.d variable
 
 CLEANFILES = variable
 
===================================================================
RCS file: ultrapossum/configure.in,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ultrapossum/configure.in	2004/07/03 04:44:23	1.38
+++ ultrapossum/configure.in	2004/09/15 12:17:50	1.39
@@ -209,7 +209,7 @@
 CONFARGS=`grep configure config.log |  grep \\\\$ | head -1 | cut -d' ' -f4-`
 AC_SUBST(CONFARGS)
 
-AC_CONFIG_FILES([test/run test/Makefile Makefile test-si/Makefile test-si/test.d/Makefile module/ultrapossum.am module/failover/heartbeat/Makefile modules ultrapossum-config module/Makefile module/server/Makefile module/failover/Makefile module/startTLS/Makefile module/dnsbalance/Makefile module/vaj-robust/Makefile config/Makefile config/ldap/Makefile ultrapossum-server])
+AC_CONFIG_FILES([test/run test/Makefile Makefile init.d/Makefile test-si/Makefile test-si/test.d/Makefile module/ultrapossum.am module/failover/heartbeat/Makefile modules ultrapossum-config module/Makefile module/server/Makefile module/failover/Makefile module/startTLS/Makefile module/dnsbalance/Makefile module/vaj-robust/Makefile config/Makefile config/ldap/Makefile ultrapossum-server])
 AC_OUTPUT
 if include "startTLS" "$modules"; then
   echo "startTLS plugin will be used which includes software"
===================================================================
RCS file: ultrapossum/modules.in,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ultrapossum/modules.in	2004/09/07 10:30:45	1.44
+++ ultrapossum/modules.in	2004/09/15 12:17:50	1.45
@@ -20,268 +20,6 @@
   set -x
 fi
 
-######
-backslash() {
-  ( IFS="\n"; while read line
-  do
-    echo "$line\\"
-  done )
-}
-
-progress() {
- if test "$old_progstr" != ""; then
-   echo -ne "\r" 1>&2
- fi
- echo -n "$@" 1>&2
- if echo "$@" | egrep 'done$' > /dev/null; then
-   echo "" 1>&2
-   old_progstr=""
- else 
-   old_progstr="$@"
- fi
-}
-
-verbose() {
-  if test "x$VERBOSE" != "x"; then
-    echo "$@" 1>&2
-  fi
-}
-
-doit() {
-  verbose $@
-  if test "x$NO_ACT" = "x"; then
-    "$@"
-  fi
-}
-
-# include <str> <strs...>
-include() {
-  for i in $2
-  do
-    if test "x$1" = "x$i"; then
-      return 0
-    fi
-  done
-  return 1
-}
-
-# ultrapossum_getconf <name> <default>
-ultrapossum_getconf() {
-  case "$ULTRAPOSSUM_CONFIG_BACKEND" in
-    ldap)
-      if test "x${!1}" = "x"; then
-        v=`ldapsearch -LLL -x -H "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_URI" -b "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BASEDN" -D "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDDN" -w "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDPW" cn=$1 description 2> /dev/null | grep "^description: " | cut -d' ' -f2-`
-        if test "x$v" = "x"; then
-          echo $2
-        else
-          echo $v
-        fi
-      else
-        echo ${!1}
-      fi
-    ;;
-    *)
-      echo ${!1:-$2}
-    ;;
-  esac
-}
-
-
-# ultrapossum_setconf <category> <name> <val>
-ultrapossum_setconf() {
-
-  if test "x$1" = "x.status"; then
-    touch $localstatedir/lib/$PACKAGE/status
-    ultrapossum_setconf_shell $localstatedir/lib/$PACKAGE/status $2 "$3"
-  else
-    case "$ULTRAPOSSUM_CONFIG_BACKEND" in
-      ldap)
-v="dn: cn=$2,$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BASEDN
-objectClass: device
-cn: $2
-description: $3
-"
-        if echo "$v" | ldapadd -x -H "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_URI" -D "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDDN" -w "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDPW" > /dev/null 2>&1; then 
-          :
-        else
-          if test "$?" = "68"; then
-        ldapmodify -x -H "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_URI" -D "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDDN" -w "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDPW" > /dev/null <<EOF
-dn: cn=$2,$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BASEDN
-changetype: modify
-replace: description
-description: $3
-EOF
-          fi 
-         fi
-       ;;
-      *)
-        if test "x$1" = "x."; then
-          config=$SYSCONFDIR/ultrapossum.cf
-        elif test "x$1" = "xsecret"; then
-          config=$SYSCONFDIR/secret.cf
-        else
-          config=$SYSCONFDIR/module.d/$1.cf
-        fi
-        touch $config
-        ultrapossum_setconf_shell $config $2 "$3"
-      ;;
-    esac
-  fi
-}
-
-# ultrapossum_setconf <path> <name> <val>
-ultrapossum_setconf_shell() {
-
-  config=$1
-  val=$3
-  tmpsetconf=`tempfile`
-  /bin/cp -p $config $tmpsetconf
-  if grep "^$2=" $config > /dev/null; then
-    sed -e "s!^$2=.*\$!$2=\"$val\"!" < $config > $tmpsetconf 
-  elif grep "^#$2=" $config > /dev/null; then
-    sed -e "/#$2=.*\$/a\\" -e "$2=\"$val\"" < $config > $tmpsetconf
-  else
-    echo "$2=\"$val\"" >> $tmpsetconf
-  fi
-  /bin/mv $tmpsetconf $config
-
-}
-
-# ultrapossum_parse_config <config>
-ultrapossum_parse_config() {
-
-  if test "x$ULTRAPOSSUMDEFAULT" != "x"; then
-    return
-  fi
-
-  case "$ULTRAPOSSUM_CONFIG_BACKEND" in
-    ldap)
-    ;;
-    *)
-      if test -f "$MODULECONFDIR/$1.cf"; then
-        fs="$MODULECONFDIR/$1.cf"
-      fi
-      if test "x$EXTRACONFSUFFIX" != "x" && test -f "$MODULECONFDIR/$1.cf$EXTRACONFSUFFIX"; then
-        fs="$fs $MODULECONFDIR/$1.cf$EXTRACONFSUFFIX"
-      fi
-
-      for f in $fs; do
-        if test -r "$f"; then
-          cat $f
-	else
-          echo "Warning: no permission to read $f" 1>&2
-        fi
-      done
-
-   ;;
-  esac
-
-}
-
-# retrieve current values of the specified variables
-# getconfig [<var...>]
-getconfig() {
-  if test "x$1" = "x"; then
-    ultrapossum-config variable | while read a
-    do
-      echo $a=\"${!a}\"
-    done
-  else
-    for a in "$@"; do
-      echo $a=\"${!a}\"
-    done
-  fi
-}
-
-# retrieve the value of the specified varialble in the specified status file
-# getvalues <status> [<var>...]
-getvalues() {
-  if test "x$2" = "x"; then
-    cat "$1"
-  else
-    f=$1
-    shift
-    for a in $@; do
-      egrep "^$a=" "$f"
-    done
-  fi
-}
-
-# getvalue <status> <var>
-getvalue() {
-  getvalues "$1" "$2" | cut -d= -f2- | sed -e 's/"\(.*\)"/\1/' 
-}
-
-# encode <value>
-encode() {
-  if test -x "$ULTRAPOSSUM_ENCODE"; then
-    echo "$@" | $ULTRAPOSSUM_ENCODE
-  else 
-    echo "$@" 
-  fi
-}
-
-# decode <value>
-decode() {
-  if test -x "$ULTRAPOSSUM_DECODE"; then
-    echo "$@" | $ULTRAPOSSUM_DECODE
-  else 
-    echo "$@" 
-  fi
-}
-
-################################################################
-
-ULTRAPOSSUMMARK=ULTRAPOSSUM$ULTRAPOSSUM_PROJECT
-
-# replace_vaconf <config> <contents> <id>
-replace_vaconf() {
-    /bin/cp -p $1 $1.tmp
-    sed -e "/$ULTRAPOSSUMMARK\-$3 START/,/$ULTRAPOSSUMMARK\-$3 END/ c\\" -e "`cat $2 | backslash` " < $1 > $1.tmp
-    /bin/mv $1.tmp $1
-}
-                                                                                
-# strip_vaconf <config> <id>
-strip_vaconf() {
-    /bin/cp -p $1 $1.tmp
-    sed -e "/$ULTRAPOSSUMMARK\-$2 START/,/$ULTRAPOSSUMMARK\-$2 END/ d" < $1 > $1.tmp
-    /bin/mv $1.tmp $1
-}
-                                                                                
-# add_end_vaconf <config> <contents> <id>
-add_end_vaconf() {
-  if grep "$ULTRAPOSSUMMARK-$3 START" $1 > /dev/null; then
-    replace_vaconf $1 $2 $3
-  else
-    cat $2 >> $1
-  fi
-}
-                                                                                
-# add_vaconf <config> <contents> <id>
-add_vaconf() {
-  if grep "$ULTRAPOSSUMMARK-$3 START" $1 > /dev/null; then
-    replace_vaconf $1 $2 $3
-  else
-    /bin/cp -p $2 $2.tmp
-    cat $2 > $2.tmp
-    cat $1 >> $2.tmp
-    /bin/mv $2.tmp $1
-  fi
-}
-
-# add_startmark <prefix> <id>
-add_startmark() {
-  echo "$1 $ULTRAPOSSUMMARK-$2 START DO NOT MODIFY HERE"
-}
-
-# add_endmark <prefix> <id>
-add_endmark() {
-  echo "$1 $ULTRAPOSSUMMARK-$2 END DO NOT MODIFY HERE"
-}
-
-
-#######
-
 prefix=${prefix:- ¡÷ prefix@}
 exec_prefix=${exec_prefix:- ¡÷ exec_prefix@}
 localstatedir=${localstatedir:- ¡÷ localstatedir@}
@@ -305,17 +43,6 @@
 CONFARGS="@CONFARGS@"
 CACHEDIR=${CACHEDIR:-$localstatedir/cache/@PACKAGE@}
 
-if test "x$cache" != "x"; then
-  if test "x$ULTRAPOSSUMDEFAULT" != "x"; then
-    cache=""
-  elif ! test -O "$CACHEDIR/$cache"; then
-    echo "W: cache is owned by another uid: $CACHEDIR/$cache" 1>&2
-    cache=""
-  fi
-fi
-
-if test "x$cache" = "x"; then
-
 # Directory Definition
 SHAREDIR=${SHAREDIR:- ¡÷ datadir@/@PACKAGE@}
 TESTDIR=${TESTDIR:- ¡÷ libdir@/@PACKAGE@/test}
@@ -333,169 +60,28 @@
 CONFSTATUS=${CONFSTATUS:-$CONFDIR/status}
 ULTRAPOSSUMCF=${ULTRAPOSSUMCF:-$SYSCONFDIR/ultrapossum.cf}
 
-HOST=${HOST:-`hostname`}
-
-# Config backend
-
 ULTRAPOSSUM_CONFIG_BACKEND=${ULTRAPOSSUM_CONFIG_BACKEND:-shell}
-if test -f "$SYSCONFDIR/config.cf"; then
-  . $SYSCONFDIR/config.cf
-fi
-
-## Default value
-
-DBNAME=`ultrapossum_getconf DBNAME ultrapossum`
-ORGANIZATION=`ultrapossum_getconf ORGANIZATION $HOST`
-SUFFIX=`ultrapossum_getconf SUFFIX "o=$DBNAME"`
-LDAPMASTER=`ultrapossum_getconf LDAPMASTER $HOST`
-SLAVES=`ultrapossum_getconf SLAVES ""`
 
-SECRETCF=""
-APPDNMODE=""
-ULTRAPOSSUM_ENCODE=""
-ULTRAPOSSUM_DECODE=""
-
-else
-  . $CACHEDIR/$cache
-fi ## cache
-
-if test "x$ULTRAPOSSUMDEFAULT" = "x"; then
-  if test -f "$ULTRAPOSSUMCF"; then
-    . $ULTRAPOSSUMCF
-  fi
-  if test "x$EXTRACONFSUFFIX" != "x" &&
-  	test -f "$ULTRAPOSSUMCF$EXTRACONFSUFFIX"
-  then
-    . $ULTRAPOSSUMCF$EXTRACONFSUFFIX
-  fi
-
-  if test -r "$SYSCONFDIR/secret.cf"; then
-    . $SYSCONFDIR/secret.cf
-  fi
-  if test "x$EXTRACONFSUFFIX" != "x" &&
-    test -r "$SYSCONFDIR/secret.cf$EXTRACONFSUFFIX"
-  then
-    . $SYSCONFDIR/secret.cf$EXTRACONFSUFFIX
-  fi
-
-  if test -d $APPSCONFDIR; then
-    for f in `find $APPSCONFDIR -name '*.cf'`
-    do
-      if test -f $f; then
-        cfs="$cfs $f"
-      fi
-    done
-    for f in `find $APPSCONFDIR -name "*.cf$EXTRACONFSUFFIX"`
-    do
-      if test -f $f; then
-        cfs="$cfs $f"
-      fi
-    done
-  fi
-
-  if test -f "$SYSCONFDIR/projects/$ULTRAPOSSUM_PROJECT"; then
-    . $SYSCONFDIR/projects/$ULTRAPOSSUM_PROJECT
-  fi
-  if test "x$EXTRACONFSUFFIX" != "x" &&
-    test -f "$SYSCONFDIR/projects/$ULTRAPOSSUM_PROJECT$EXTRACONFSUFFIX"
-  then
-    . $SYSCONFDIR/projects/$ULTRAPOSSUM_PROJECT$EXTRACONFSUFFIX
+# loading cache data
+if test "x$cache" != "x"; then
+  if test "x$ULTRAPOSSUMDEFAULT" != "x"; then
+    cache=""
+  elif ! test -O "$CACHEDIR/$cache"; then
+    echo "W: cache is owned by another uid: $CACHEDIR/$cache" 1>&2
+    cache=""
   fi
-
-  if test "x$cfs" != "x"; then
-    for cf in $cfs
-    do
-      if test -f "$cf"; then
-        if test -r "$cf"; then
-          verbose -n "Using $cf... "
-          . $cf
-          verbose "done"
-        else
-          echo "Warning: no permission to read $cf" 1>&2
-        fi
-      else
-        echo "W: $cf not found" 1>&2
-      fi
-    done
+  if test "x$cache" != "x"; then
+    . $CACHEDIR/$cache
   fi
 fi
 
-### compat ###
-
-if test -x "/bin/tempfile"; then
-  :
-elif test -x "/bin/mktemp"; then
-  tempfile() {
-    /bin/mktemp /tmp/`basename $0`.XXXXXX
-  }
-else
-  tempfile() {
-    # FIXME: need more sophisticated solution
-    name="/tmp/ultrapossum.`basename $0`.`sh -c 'echo \$\$'`.`date +%S`"
-    if test -e $name; then
-      sleep 1
-      name="/tmp/ultrapossum.`basename $0`.$$.`date +%S`"
-    fi
-    /bin/cp -i /dev/null $name
-    echo $name
-  }
-fi
-
-if test `uname` = "SunOS"; then
-
-  sed() {
-   tmpsed=`tempfile`
-   for arg in "$@"
-   do
-     if test "x$arg" != "x-e"; then
-       echo "$arg" >> $tmpsed
-     fi
-   done
-   if test "x$ULTRAPOSSUM_DEBUG" != "x"; then
-     cat $tmpsed 1>&2
-   fi
-   /usr/bin/sed -f $tmpsed
-   /bin/rm -f $tmpsed
- }
-
-fi
-
-#if test "x$VIRTUAL" != "x"; then
-#  LDAPMASTER="$VIRTUAL"
-#else
-#  LDAPMASTER="$MASTER"
-#fi
-
-# load plugin module
-if test -f $localstatedir/lib/$PACKAGE/status; then
-  . $localstatedir/lib/$PACKAGE/status
-fi
-
-if test -d $MODULEDIR; then
-  for f in `/bin/ls $MODULEDIR`
-  do
-    if test -f $MODULEDIR/$f; then
-      . $MODULEDIR/$f
-    fi
-  done
-fi
-
-# Building Logical Variables
-if test "x$TYPE" = "x"; then
-  TYPE=client
-  if test "x$MASTER" = "x$HOST" || include "$HOST" "$SYNCBACKUPS"; then
-    TYPE=master
-  else
-    for s in $SLAVES
-    do
-      if test "x$s" = "x$HOST"; then
-        TYPE=slave
-      fi
-    done
-  fi
-fi
-##############
+# load initialization plugin
+for f in `/bin/ls $SHAREDIR/init.d | sort`
+do
+  . $SHAREDIR/init.d/$f
+done
 
+# storing cache
 if test "x$cache" = "x" && test "x$ULTRAPOSSUMDEFAULT" = "x"; then
   if ! test -d "$CACHEDIR"; then
     install -d $CACHEDIR
@@ -505,4 +91,3 @@
   getconfig >> $CACHEDIR/$$
   export cache="$$"
 fi
-


From taru ¡÷ users.sourceforge.jp  Wed Sep 15 21:17:50 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 15 Sep 2004 21:17:50 +0900
Subject: [Ultrapossum-cvs 415] ultrapossum/debian 1.7, 1.8,
	ultrapossum-common.install
Message-ID: <20040915121750.8964A2AC038@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/ultrapossum-common.install,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ultrapossum/debian/ultrapossum-common.install	2004/05/13 15:41:31	1.7
+++ ultrapossum/debian/ultrapossum-common.install	2004/09/15 12:17:50	1.8
@@ -1,6 +1,7 @@
 debian/tmp/usr/sbin/update-ultrapossum
 debian/tmp/usr/bin/ultrapossum-config
 debian/tmp/usr/share/ultrapossum/modules
+debian/tmp/usr/share/ultrapossum/init.d
 debian/tmp/usr/share/ultrapossum/term
 debian/tmp/usr/share/ultrapossum/variable
 debian/tmp/usr/share/ultrapossum/ucf/ultrapossum/ultrapossum.cf


From taru ¡÷ users.sourceforge.jp  Wed Sep 15 21:17:50 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 15 Sep 2004 21:17:50 +0900
Subject: [Ultrapossum-cvs 416] ultrapossum/init.d ...
Message-ID: <20040915121750.ADAD72AC039@users.sourceforge.jp>



From taru ¡÷ users.sourceforge.jp  Wed Sep 15 21:33:34 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 15 Sep 2004 21:33:34 +0900
Subject: [Ultrapossum-cvs 417] ultrapossum/init.d 1.1,1.2,10config
Message-ID: <20040915123334.8A7B12AC02B@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/init.d/10config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ultrapossum/init.d/10config	2004/09/15 12:17:50	1.1
+++ ultrapossum/init.d/10config	2004/09/15 12:33:34	1.2
@@ -11,7 +11,9 @@
     read description
     cn=`echo $cn | cut -d' ' -f2-`
     description=`echo $description | cut -d' ' -f2-`
-    echo "$cn='$description'"
+    if test "x${!cn}" = "x"; then
+      echo "$cn='$description'"
+    fi
   done
   ;;
   esac


From taru ¡÷ users.sourceforge.jp  Thu Sep 16 02:50:48 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 16 Sep 2004 02:50:48 +0900
Subject: [Ultrapossum-cvs 418] demo/haviewer 1.20,1.21,haviewer.glade
Message-ID: <20040915175048.6055F2AC03B@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/haviewer.glade,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- demo/haviewer/haviewer.glade	2004/09/15 09:42:58	1.20
+++ demo/haviewer/haviewer.glade	2004/09/15 17:50:48	1.21
@@ -562,7 +562,7 @@
 		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
 		      <property name="headers_visible">True</property>
-		      <property name="rules_hint">False</property>
+		      <property name="rules_hint">True</property>
 		      <property name="reorderable">False</property>
 		      <property name="enable_search">True</property>
 		    </widget>


From taru ¡÷ users.sourceforge.jp  Thu Sep 16 13:21:37 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 16 Sep 2004 13:21:37 +0900
Subject: [Ultrapossum-cvs 419] plugin/slapd/upstream ...
Message-ID: <20040916042137.3A12E2AC042@users.sourceforge.jp>

===================================================================
RCS file: plugin/slapd/upstream/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin/slapd/upstream/Makefile.am	2004/09/15 08:56:09	1.3
+++ plugin/slapd/upstream/Makefile.am	2004/09/16 04:21:37	1.4
@@ -9,7 +9,7 @@
 	$(MAKE) -C build-tree/openldap-$(OPENLDAP_VERSION)
 
 build-tree/openldap-$(OPENLDAP_VERSION)/config.status:
-	install -d build-tree && cd build-tree && tar zxf ../openldap-$(OPENLDAP_VERSION).tgz && cd openldap-$(OPENLDAP_VERSION) && patch -p1 < ../../syncbackup-$(OPENLDAP_VERSION).patch && chmod 755 tests/scripts/test101-syncbackup && ./configure --prefix=${moduledir}/slapd --sysconfdir=${sysconfdir}/ultrapossum/slapd --localstatedir=${localstatedir}/lib/ultrapossum/slapd/
+	install -d build-tree && cd build-tree && tar zxf ../openldap-$(OPENLDAP_VERSION).tgz && cd openldap-$(OPENLDAP_VERSION) && patch -p1 < ../../syncbackup-$(OPENLDAP_VERSION).patch && patch -p1 < ../../slapd.conf-$(OPENLDAP_VERSION).patch && chmod 755 tests/scripts/test101-syncbackup && ./configure --prefix=${moduledir}/slapd --sysconfdir=${sysconfdir}/ultrapossum/slapd --localstatedir=${localstatedir}/lib/ultrapossum/slapd/
 
 check-local:
 	$(MAKE) -C build-tree/openldap-$(OPENLDAP_VERSION) test
@@ -21,6 +21,6 @@
 	/bin/rm -rf build-tree
 
 
-EXTRA_DIST = openldap-$(OPENLDAP_VERSION).tgz syncbackup-2.2.14.patch
+EXTRA_DIST = openldap-$(OPENLDAP_VERSION).tgz syncbackup-$(OPENLDAP_VERSION).patch slapd.conf-$(OPENLDAP_VERSION).patch
 
 .PHONY: build-upstream


From taru ¡÷ users.sourceforge.jp  Thu Sep 16 15:04:43 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 16 Sep 2004 15:04:43 +0900
Subject: [Ultrapossum-cvs 420] demo/haviewer 1.3,1.4,haviewer
Message-ID: <20040916060443.1ED5C2AC04D@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/haviewer,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- demo/haviewer/haviewer	2004/09/11 14:56:32	1.3
+++ demo/haviewer/haviewer	2004/09/16 06:04:43	1.4
@@ -2,10 +2,27 @@
 
 set -e
 
+usage() {
+  echo "Usage: $0 [ -c <sysconfdir> ]"
+}
+
 SHAREDIR=/usr/share/haviewer
 
 if test -f "lib/haviewer/haviewer.rb"; then
   SHAREDIR=`pwd`
+fi
+
+if test "x$1" = "x-c"; then
+  if test "x$2" != "x"; then
+    SYSCONFDIR=$2
+    export SYSCONFDIR
+  else
+    usage
+    exit 1
+  fi
+elif test "x$1" != "x"; then
+  usage
+  exit 1
 fi
 
 ruby -I$SHAREDIR/lib $SHAREDIR/lib/haviewer/haviewer.rb $SHAREDIR/haviewer.glade


From taru ¡÷ users.sourceforge.jp  Thu Sep 16 15:04:43 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 16 Sep 2004 15:04:43 +0900
Subject: [Ultrapossum-cvs 421] demo/haviewer/lib 1.1,1.2,ultrapossum.rb
Message-ID: <20040916060443.37D862AC04F@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/lib/ultrapossum.rb,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- demo/haviewer/lib/ultrapossum.rb	2004/09/11 14:52:16	1.1
+++ demo/haviewer/lib/ultrapossum.rb	2004/09/16 06:04:43	1.2
@@ -41,13 +41,22 @@
       VARIABLES[m] = variables(m)
     end
 
-    def initialize
-      open("|ultrapossum-config get") do |io|
+    def initialize( sysconfdir = nil )
+      env = ""
+      if ! sysconfdir.nil?
+        if FileTest.directory?( sysconfdir )
+          env = "SYSCONFDIR=#{sysconfdir}"
+	else
+	  raise "No such directory: #{sysconfdir}"
+	end
+      end
+      open("|sh -c '#{env} ultrapossum-config get'") do |io|
         io.each_line do |line|
           /([^=]+)=\"(.*)\"/ =~ line
-	  self[$1] = $2
-	end
+          self[$1] = $2
+        end
       end
+    
     end
 
   end
@@ -61,7 +70,7 @@
       puts "\t#{v}"
     end
   end
-  conf = UltraPossum::Config.new
+  conf = UltraPossum::Config.new(ARGV[0])
   conf.each_key do |key|
     puts "#{key} -> #{conf[key]}"
   end


From taru ¡÷ users.sourceforge.jp  Thu Sep 16 15:04:43 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 16 Sep 2004 15:04:43 +0900
Subject: [Ultrapossum-cvs 422] demo/haviewer/lib/haviewer ...
Message-ID: <20040916060443.56C612AC050@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/lib/haviewer/haviewer.rb,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- demo/haviewer/lib/haviewer/haviewer.rb	2004/09/15 09:24:36	1.4
+++ demo/haviewer/lib/haviewer/haviewer.rb	2004/09/16 06:04:43	1.5
@@ -164,7 +164,7 @@
 $haview.add_view( "status", HAViewer::UltraPossum.new($haview) )
 $haview.add_view( "entry", HAViewer::UltraPossum::EntryView.new($haview) )
 $haview.add_view( "config", HAViewer::UltraPossum::ConfigView.new($haview) )
-$haview.glade["dialog1"].set_title(  "UltraPossum HA Viewer (#{HAViewer::UltraPossum::Conf["ORGANIZATION"]})" )
+$haview.glade["dialog1"].set_title(  "UltraPossum HA Viewer (#{HAViewer::UltraPossumHost.conf["ORGANIZATION"]})" )
 $haview.update
 HAViewer::Hosts.each do |host|
   $haview.views.each do |name,view|
===================================================================
RCS file: demo/haviewer/lib/haviewer/ultrapossum.rb,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- demo/haviewer/lib/haviewer/ultrapossum.rb	2004/09/15 09:24:36	1.8
+++ demo/haviewer/lib/haviewer/ultrapossum.rb	2004/09/16 06:04:43	1.9
@@ -1,157 +1,163 @@
-require 'open3'
 require 'ultrapossum'
 
 class HAViewer
 
-  class UltraPossum < HAViewer::View
-    
-    Conf = ::UltraPossum::Config.new
-
-    class UltraPossumHost < Host
+  class UltraPossumHost < Host
 
-      OID = "private.12345"  # .2.101.1"
-      OID_STATUS = OID + ".1.1.0"
-      OID_PID = OID + ".1.2.0"
-      OID_SINCE = OID + ".1.3.0"
-
-      @@latest_entryCSN = ""
-      @@monitored_entry = "cn=u0001,#{Conf["SUFFIX"]}"
-
-      def UltraPossumHost.update_latest_entryCSN
-        `ldapsearch -l 1 -x -h #{Conf["LDAPMASTER"]} -b #{@@monitored_entry} -s base -LLL +`.each_line do |line|
-          case line
-          when /entryCSN: (.+)/
-            @@latest_entryCSN = $1
-          end
+    OID = "private.12345"  # .2.101.1"
+    OID_STATUS = OID + ".1.1.0"
+    OID_PID = OID + ".1.2.0"
+    OID_SINCE = OID + ".1.3.0"
+    
+    @@conf = ::UltraPossum::Config.new
+    @@latest_entryCSN = ""
+    @@monitored_entry = "cn=u0001,#{@@conf["SUFFIX"]}"
+
+    def UltraPossumHost.update_latest_entryCSN
+      `ldapsearch -l 1 -x -h #{UltraPossumHost.conf["LDAPMASTER"]} -b #{@@monitored_entry} -s base -LLL +`.each_line do |line|
+        case line
+        when /entryCSN: (.+)/
+          @@latest_entryCSN = $1
         end
-        UltraPossumHosts.each do |host|
-          case host.entryCSN
-          when ""
-            host.repl_sign.off
-          when @@latest_entryCSN
-            host.repl_sign.on(Green)
-          else
-            host.repl_sign.on(Yellow)
-          end
+      end
+      UltraPossumHosts.each do |host|
+        case host.entryCSN
+        when ""
+          host.repl_sign.off
+        when @@latest_entryCSN
+          host.repl_sign.on(Green)
+        else
+          host.repl_sign.on(Yellow)
         end
       end
+    end
 
-      def UltraPossumHost.monitored_entry
-        @@monitored_entry
-      end
-      
-      def UltraPossumHost.latest_entryCSN
-        @@latest_entryCSN
-      end
+    def UltraPossumHost.monitored_entry
+      @@monitored_entry
+    end
+    
+    def UltraPossumHost.latest_entryCSN
+      @@latest_entryCSN
+    end
 
-      def initialize( host, type )
-        super
-        @entryCSN = ""
-      end
+    def UltraPossumHost.conf
+      return @@conf
+    end
 
-      def update
-        snmp
-        monitor_entry
-      end
+    def UltraPossumHost.set_conf( conf )
+      @@conf = conf
+    end
 
-      def monitor_entry
-        @entryCSN = ""
-        return if ! avail?
-        `ldapsearch -l 1 -x -h #{@host} -b #{@@monitored_entry} -s base -LLL +`.each_line do |line|
-          case line
-          when /entryCSN: (.+)/
-            @entryCSN = $1
-          end
-        end
-        case @entryCSN
-        when ""
-          @repl_sign.off
-        when @@latest_entryCSN
-          @repl_sign.on(Green)
-        else
-          @repl_sign.on(Red)
-        end
+    def initialize( host, type )
+      super
+      @entryCSN = ""
+    end
+
+    def update
+      snmp
+      monitor_entry
+    end
+
+    def monitor_entry
+      @entryCSN = ""
+      return if ! avail?
+      `ldapsearch -l 1 -x -h #{@host} -b #{@@monitored_entry} -s base -LLL +`.each_line do |line|
+        case line
+        when /entryCSN: (.+)/
+          @entryCSN = $1
+        end
+      end
+      case @entryCSN
+      when ""
+        @repl_sign.off
+      when @@latest_entryCSN
+        @repl_sign.on(Green)
+      else
+        @repl_sign.on(Red)
       end
+    end
 
-      def snmp
-        statusbuf = nil
-        pidbuf = nil
-        sincebuf = nil
-        puts "snmpget -v1 -t 3 -c ultrapossum #{@host} #{OID_STATUS} #{OID_PID} #{OID_SINCE}" if $DEBUG
-        buf = `snmpget -v1 -t 3 -c ultrapossum #{@host} #{OID_STATUS} #{OID_PID} #{OID_SINCE}`
-        buf.each_line do |line|
-          case line
-          when /#{OID_STATUS}/
-              statusbuf = line.gsub(/^[^"]+"(.*)"\n/, '\1')
-            statusbuf = "-----" if statusbuf.size == 0
-          when /#{OID_PID}/
-              pidbuf = line.gsub(/^[^"]+"(.*)"\n/, '\1')
-            pidbuf = "-----" if pidbuf.size == 0
-          when /#{OID_SINCE}/
-              sincebuf = line.gsub(/^[^"]+"(.*)"\n/, '\1')
-            sincebuf = "-----" if sincebuf.size == 0
-          end
-        end
-        @status = statusbuf
-        @pid = pidbuf
-        @since = sincebuf
-
-        c = ""
-        case @status
-        when "DEAD"
-          c = Red
-        when "STOP"
-          c = Red
-        when "ACTIVE"
-          c = Green
-        when "FAOVER"
-          c = Yellow
-        when "STANDBY"
-          c = Green
-        when "RUN"
-          c = Green
-        end
-        @sign.on(c)
-      end
-
-      def avail?
-        return true if @status == "STANDBY" || @status == "ACTIVE" || @status == "RUN"
-        return false
-      end
-
-      attr_accessor :status, :pid, :since, :entryCSN
+    def snmp
+      statusbuf = nil
+      pidbuf = nil
+      sincebuf = nil
+      puts "snmpget -v1 -t 3 -c ultrapossum #{@host} #{OID_STATUS} #{OID_PID} #{OID_SINCE}" if $DEBUG
+      buf = `snmpget -v1 -t 3 -c ultrapossum #{@host} #{OID_STATUS} #{OID_PID} #{OID_SINCE}`
+      buf.each_line do |line|
+        case line
+        when /#{OID_STATUS}/
+            statusbuf = line.gsub(/^[^"]+"(.*)"\n/, '\1')
+          statusbuf = "-----" if statusbuf.size == 0
+        when /#{OID_PID}/
+            pidbuf = line.gsub(/^[^"]+"(.*)"\n/, '\1')
+          pidbuf = "-----" if pidbuf.size == 0
+        when /#{OID_SINCE}/
+            sincebuf = line.gsub(/^[^"]+"(.*)"\n/, '\1')
+          sincebuf = "-----" if sincebuf.size == 0
+        end
+      end
+      @status = statusbuf
+      @pid = pidbuf
+      @since = sincebuf
+
+      c = ""
+      case @status
+      when "DEAD"
+        c = Red
+      when "STOP"
+        c = Red
+      when "ACTIVE"
+        c = Green
+      when "FAOVER"
+        c = Yellow
+      when "STANDBY"
+        c = Green
+      when "RUN"
+        c = Green
+      end
+      @sign.on(c)
+    end
 
+    def avail?
+      return true if @status == "STANDBY" || @status == "ACTIVE" || @status == "RUN"
+      return false
     end
 
-    UltraPossumHosts = []
-    begin
-      hash = {}
-      ary =  [ Conf["MASTER"], Conf["BACKUP"], Conf["SYNCBACKUPS"] ]
-      ary.each do |val|
-        next if val.nil?
-        host = nil
-        val.split(' ').each do |s|
-          host = UltraPossumHost.new(s,"master")
-          if hash[s].nil?
-            UltraPossumHosts << host
-            Hosts << host
-            hash[s] = host
-          end
+    attr_accessor :status, :pid, :since, :entryCSN
+
+  end
+
+  UltraPossumHosts = []
+  begin
+    hash = {}
+    ary =  [ UltraPossumHost.conf["MASTER"], UltraPossumHost.conf["BACKUP"], UltraPossumHost.conf["SYNCBACKUPS"] ]
+    ary.each do |val|
+      next if val.nil?
+      host = nil
+      val.split(' ').each do |s|
+        host = UltraPossumHost.new(s,"master")
+        if hash[s].nil?
+          UltraPossumHosts << host
+          Hosts << host
+          hash[s] = host
         end
       end
-      if ! Conf["SLAVES"].nil?
-        Conf["SLAVES"].split(' ').each do |s|
-          host = UltraPossumHost.new(s,"slave")
-          if hash[s].nil?
-            UltraPossumHosts << host
-            Hosts << host
-            hash[s] = host
-          end
+    end
+    if ! UltraPossumHost.conf["SLAVES"].nil?
+      UltraPossumHost.conf["SLAVES"].split(' ').each do |s|
+        host = UltraPossumHost.new(s,"slave")
+        if hash[s].nil?
+          UltraPossumHosts << host
+          Hosts << host
+          hash[s] = host
         end
       end
     end
-    UltraPossumHost.update_latest_entryCSN
+  end
+  UltraPossumHost.update_latest_entryCSN
 
+  class UltraPossum < HAViewer::View
+    
     Column = ["S", "Host", "Type", "Status", "Pid", "Since" ]
 
     def initialize(haview)
@@ -237,7 +243,7 @@
           STDERR.reopen(pe[1])
           pe[1].close
 
-          exec("ldapmodify -x -h #{Conf["LDAPMASTER"]} -D #{Conf["ROOTDN"]} -w #{Conf["ROOTPW"]}")
+          exec("ldapmodify -x -h #{UltraPossumHost.conf["LDAPMASTER"]} -D #{UltraPossumHost.conf["ROOTDN"]} -w #{UltraPossumHost.conf["ROOTPW"]}")
         }
 
         pw[0].close
@@ -314,10 +320,10 @@
           @columns << Gtk::TreeViewColumn.new(Column[i], Gtk::CellRendererText.new, { :markup => i })
         end
         @row = {}
-        Conf.keys.sort.each do |key|
+        UltraPossumHost.conf.keys.sort.each do |key|
           @row[key] = @list.append
           @list.set_value(@row[key], 0, key )
-          @list.set_value(@row[key], 1, Conf[key] )
+          @list.set_value(@row[key], 1, UltraPossumHost.conf[key] )
         end
         @columns.each do |val|
           @glade["treeview3"].append_column(val)


From taru ¡÷ users.sourceforge.jp  Thu Sep 16 16:33:37 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 16 Sep 2004 16:33:37 +0900
Subject: [Ultrapossum-cvs 423] demo/haviewer/lib 1.2,1.3,ultrapossum.rb
Message-ID: <20040916073337.10E5E2AC047@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/lib/ultrapossum.rb,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- demo/haviewer/lib/ultrapossum.rb	2004/09/16 06:04:43	1.2
+++ demo/haviewer/lib/ultrapossum.rb	2004/09/16 07:33:36	1.3
@@ -20,27 +20,6 @@
 
   class Config < Hash
 
-    MODULES = [] 
-    open("|ultrapossum-config module") do |io|
-      io.each_line do |line|
-        MODULES << line.chop!
-      end
-    end
-
-    def Config.variables (mod)
-      variables = []
-      open("|ultrapossum-config variable #{mod}") do |io|
-        io.each_line do |line|
-	  variables << line.chop!
-	end
-      end
-      variables
-    end
-    VARIABLES = {}
-    MODULES.each do |m|
-      VARIABLES[m] = variables(m)
-    end
-
     def initialize( sysconfdir = nil )
       env = ""
       if ! sysconfdir.nil?
@@ -64,12 +43,6 @@
 end
 
 if __FILE__ == $0
-  UltraPossum::Config::MODULES.each do |m|
-    puts m
-    UltraPossum::Config::VARIABLES[m].each do |v|
-      puts "\t#{v}"
-    end
-  end
   conf = UltraPossum::Config.new(ARGV[0])
   conf.each_key do |key|
     puts "#{key} -> #{conf[key]}"


From taru ¡÷ users.sourceforge.jp  Thu Sep 16 16:40:28 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 16 Sep 2004 16:40:28 +0900
Subject: [Ultrapossum-cvs 424] ultrapossum ...
Message-ID: <20040916074028.7B77E2AC051@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ultrapossum/Makefile.am	2004/09/15 12:17:50	1.13
+++ ultrapossum/Makefile.am	2004/09/16 07:40:28	1.14
@@ -64,3 +64,5 @@
 	term \
 	COPYRIGHT
 
+.PHONY: init.d/variable
+
===================================================================
RCS file: ultrapossum/ultrapossum-config.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ultrapossum/ultrapossum-config.in	2004/04/23 07:47:39	1.15
+++ ultrapossum/ultrapossum-config.in	2004/09/16 07:40:28	1.16
@@ -32,28 +32,31 @@
         echo ". $SHAREDIR/term"
 	;;
     xvariable)
+        . $SHAREDIR/init.d/10config
         shift
-        if test "x$1" = "x"; then
-          modules=`ultrapossum-config module`
-	else
-	  modules="$@"
-	fi
-	for m in $modules 
-	do
-	  if test -f "$MODULEDIR/$m/variable-$m"; then
-	    cat "$MODULEDIR/$m/variable-$m"
-	  else
-	    if test -d "$MODULEDIR/$m/"; then
-	      /bin/ls $MODULEDIR/[0-9][0-9]$m | while read f; do
-	        egrep "[A-Z_][A-Z_]*=" $f | cut -d= -f1 | grep -v IFS | tr -d ' ' | sort | uniq
-              done
-	    else
-	       echo "E: No such module: $m" 1>&2
-	       exit 1
-	    fi
-	  fi
-	done
-        if test "x$1" = "x"; then cat $SHAREDIR/variable; fi
+        getvariable "$@"
+#        shift
+#        if test "x$1" = "x"; then
+#          modules=`ultrapossum-config module`
+#	else
+#	  modules="$@"
+#	fi
+#	for m in $modules 
+#	do
+#	  if test -f "$MODULEDIR/$m/variable-$m"; then
+#	    cat "$MODULEDIR/$m/variable-$m"
+#	  else
+#	    if test -d "$MODULEDIR/$m/"; then
+#	      /bin/ls $MODULEDIR/[0-9][0-9]$m | while read f; do
+#	        egrep "[A-Z_][A-Z_]*=" $f | cut -d= -f1 | grep -v IFS | tr -d ' ' | sort | uniq
+#              done
+#	    else
+#	       echo "E: No such module: $m" 1>&2
+#	       exit 1
+#	    fi
+#	  fi
+#	done
+#        if test "x$1" = "x"; then cat $SHAREDIR/variable; fi
         ;;
     xget)
         shift


From taru ¡÷ users.sourceforge.jp  Thu Sep 16 16:40:28 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 16 Sep 2004 16:40:28 +0900
Subject: [Ultrapossum-cvs 425] ultrapossum/debian 1.45,1.46,changelog
Message-ID: <20040916074028.8D7E72AC056@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/changelog,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ultrapossum/debian/changelog	2004/09/13 04:58:16	1.45
+++ ultrapossum/debian/changelog	2004/09/16 07:40:28	1.46
@@ -1,3 +1,11 @@
+ultrapossum (0.1beta7-0pre8) unstable; urgency=low
+
+  * Applied the latest upstream version.
+     - initialization plugin under init.d/
+     - retrieve variable from ldap correctly when backend is ldap
+
+ -- Masato Taruishi <taru ¡÷ valinux.co.jp>  Thu, 16 Sep 2004 16:37:44 +0900
+
 ultrapossum (0.1beta7-0pre7) unstable; urgency=low
 
   * Applied the latest upstream version.


From taru ¡÷ users.sourceforge.jp  Thu Sep 16 16:40:28 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 16 Sep 2004 16:40:28 +0900
Subject: [Ultrapossum-cvs 426] ultrapossum/init.d 1.2,1.3,10config
Message-ID: <20040916074028.A4B222AC057@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/init.d/10config,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ultrapossum/init.d/10config	2004/09/15 12:33:34	1.2
+++ ultrapossum/init.d/10config	2004/09/16 07:40:28	1.3
@@ -122,6 +122,47 @@
 
 }
 
+# retrieve the known variables
+# getvariable [<module>...]
+getvariable() {
+  if test "x$1" = "x"; then
+    modules=`ultrapossum-config module`
+  else
+    modules="$@"
+  fi
+  case "$ULTRAPOSSUM_CONFIG_BACKEND" in
+  ldap)
+    if test "x$cache" != "x" && test -f "$CACHEDIR/$cache"; then
+      grep -v '#' "$CACHEDIR/$cache" | sed 's/^\([^=]*\)=.*"/\1/'
+    else
+      ldapsearch -LLL -x -H "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_URI" -b "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BASEDN" -D "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDDN" -w "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDPW" objectClass=\* cn  | egrep cn: | cut -d' ' -f2-
+    fi
+    ;;
+  *)
+    getvariable_shell $modules
+    ;;
+  esac
+}
+
+getvariable_shell() {
+ ( for m in "$@"
+  do
+    if test -f "$MODULEDIR/$m/variable-$m"; then
+      cat "$MODULEDIR/$m/variable-$m"
+    else
+      if test -d "$MODULEDIR/$m/"; then
+        /bin/ls $MODULEDIR/[0-9][0-9]$m | while read f; do
+          egrep "[A-Z_][A-Z_]*=" $f | cut -d= -f1 | grep -v IFS | tr -d ' ' | sort | uniq
+        done
+      else
+        echo "E: No such module: $m" 1>&2
+        return 1
+      fi
+    fi
+  done
+  cat $SHAREDIR/variable ) | sort | uniq
+}
+
 # retrieve current values of the specified variables
 # getconfig [<var...>]
 getconfig() {


From taru ¡÷ users.sourceforge.jp  Thu Sep 16 16:45:53 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 16 Sep 2004 16:45:53 +0900
Subject: [Ultrapossum-cvs 427] ultrapossum/debian 1.46,1.47,changelog
Message-ID: <20040916074553.E2FEC2AC056@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/changelog,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- ultrapossum/debian/changelog	2004/09/16 07:40:28	1.46
+++ ultrapossum/debian/changelog	2004/09/16 07:45:53	1.47
@@ -1,3 +1,9 @@
+ultrapossum (0.1beta8-0pre18-0pre18-0pre18-0pre18-0pre18-0pre18-0pre18-0pre1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Masato Taruishi <taru ¡÷ valinux.co.jp>  Thu, 16 Sep 2004 16:43:49 +0900
+
 ultrapossum (0.1beta7-0pre8) unstable; urgency=low
 
   * Applied the latest upstream version.


From taru ¡÷ users.sourceforge.jp  Thu Sep 16 16:45:53 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 16 Sep 2004 16:45:53 +0900
Subject: [Ultrapossum-cvs 428] ultrapossum 1.39,1.40,configure.in
Message-ID: <20040916074553.CB4312AC054@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/configure.in,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ultrapossum/configure.in	2004/09/15 12:17:50	1.39
+++ ultrapossum/configure.in	2004/09/16 07:45:53	1.40
@@ -4,8 +4,8 @@
 # $Id$
 
 AC_PREREQ(2.50)
-AC_INIT(ultrapossum, 0.1beta7, taru ¡÷ ultrapossum.org)
-AM_INIT_AUTOMAKE(ultrapossum, 0.1beta7)
+AC_INIT(ultrapossum, 0.1beta8, taru ¡÷ ultrapossum.org)
+AM_INIT_AUTOMAKE(ultrapossum, 0.1beta8)
 
 # Checks for programs.
 AC_PROG_INSTALL


From taru ¡÷ users.sourceforge.jp  Thu Sep 16 17:00:46 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 16 Sep 2004 17:00:46 +0900
Subject: [Ultrapossum-cvs 429] ultrapossum/debian 1.47,1.48,changelog
Message-ID: <20040916080046.A1CAD2AC016@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/changelog,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ultrapossum/debian/changelog	2004/09/16 07:45:53	1.47
+++ ultrapossum/debian/changelog	2004/09/16 08:00:46	1.48
@@ -1,4 +1,4 @@
-ultrapossum (0.1beta8-0pre18-0pre18-0pre18-0pre18-0pre18-0pre18-0pre18-0pre1) unstable; urgency=low
+ultrapossum (0.1beta8-0pre1) unstable; urgency=low
 
   * New upstream release.
 


From taru ¡÷ users.sourceforge.jp  Thu Sep 16 17:14:49 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 16 Sep 2004 17:14:49 +0900
Subject: [Ultrapossum-cvs 430] demo/haviewer/debian 1.1,1.2,control
Message-ID: <20040916081449.232412AC012@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/debian/control,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- demo/haviewer/debian/control	2004/09/11 14:56:07	1.1
+++ demo/haviewer/debian/control	2004/09/16 08:14:49	1.2
@@ -7,6 +7,6 @@
 
 Package: haviewer
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, libuconv-ruby1.8, libglade2-ruby, libgnome2-ruby, snmp
+Depends: ${shlibs:Depends}, ${misc:Depends}, ultrapossum-common, libuconv-ruby1.8, libglade2-ruby, libgnome2-ruby, snmp
 Description: UltraPossum Simple High-Availability viewer
  <insert long description, indented with spaces>


From taru ¡÷ users.sourceforge.jp  Thu Sep 16 20:14:58 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 16 Sep 2004 20:14:58 +0900
Subject: [Ultrapossum-cvs 431] ultrapossum/debian ...
Message-ID: <20040916111458.D4F5A2AC071@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/ultrapossum-common.config,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ultrapossum/debian/ultrapossum-common.config	2004/03/31 13:24:35	1.3
+++ ultrapossum/debian/ultrapossum-common.config	2004/09/16 11:14:58	1.4
@@ -7,14 +7,101 @@
 db_version 2.0
 db_title "UltraPossum Configuration"
 
+check_ldap() {
+  db_get ultrapossum-common/config_backend_ldap_uri
+  ldapuri="$RET"
+  db_get ultrapossum-common/config_backend_ldap_basedn
+  ldapbasedn="$RET"
+  db_get ultrapossum-common/config_backend_ldap_binddn
+  ldapbinddn="$RET"
+  db_get ultrapossum-common/config_backend_ldap_bindpw
+  ldapbindpw="$RET"
+  if test "x`ldapsearch -LLL -x -H "$ldapuri" -b "$ldapbasedn" -D "$ldapbinddn" -w "$ldapbindpw" -s one description=\*`" = "x"; then
+    return 1
+  else
+    return 0
+  fi
+}
+
 SUFFIX="o=ultrapossum"
-if test "$1" = "reconfigure" ; then
+if test -x "/usr/bin/ultrapossum-config"; then
   eval `/usr/bin/ultrapossum-config init`
   trap "eval `ultrapossum-config term`" 0
 elif test -f "/etc/ultrapossum/ultrapossum.cf"; then
   . /etc/ultrapossum/ultrapossum.cf
 fi
 
-db_set ultrapossum-common/suffix $SUFFIX
+if test "$1" = "reconfigure"; then
+  db_set ultrapossum-common/suffix $SUFFIX
+  db_set ultrapossum-common/config_backend_ldap_uri "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_URI"
+  db_set ultrapossum-common/config_backend_ldap_basedn "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BASEDN"
+  db_set ultrapossum-common/config_backend_ldap_binddn "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDDN"
+  db_set ultrapossum-common/config_backend_ldap_bindpw "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDPW"
+  db_set ultrapossum-common/config_backend_ldap_bindpw2 "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDPW"
+fi
+
+case "$ULTRAPOSSUM_CONFIG_BACKEND" in
+  ldap)
+    backend=ldap
+  ;;
+  *)
+    backend=file
+  ;;    
+esac
+
+db_set ultrapossum-common/config_backend "$backend"
 
+STATE=start
+while test "$STATE" != "end"; do
+  case "$STATE" in
+    start)
+      db_input low ultrapossum-common/config_backend || true
+      db_go
+      db_get ultrapossum-common/config_backend
+      backend=$RET
+      case "$backend" in
+        ldap)
+          STATE=ldapstart
+        ;;
+        *)
+          STATE=end
+      esac
+    ;;
+    ldapstart)
+      db_input low ultrapossum-common/config_backend_ldap_uri || true
+      db_input low ultrapossum-common/config_backend_ldap_basedn || true
+      db_input low ultrapossum-common/config_backend_ldap_binddn || true
+      STATE=ldappasswd
+    ;;
+    ldappasswd)
+      db_input low ultrapossum-common/config_backend_ldap_bindpw || true
+      db_input low ultrapossum-common/config_backend_ldap_bindpw2 || true
+      db_go
+      db_get ultrapossum-common/config_backend_ldap_bindpw
+      passwd="$RET"
+      db_get ultrapossum-common/config_backend_ldap_bindpw2
+      if test "x$passwd" != "x$RET"; then
+        db_fset ultrapossum-common/config_backend_ldap_password_mismatch seen false
+        db_input low ultrapossum-common/config_backend_ldap_password_mismatch
+        db_go
+        db_fset ultrapossum-common/config_backend_ldap_bindpw seen false
+        db_fset ultrapossum-common/config_backend_ldap_bindpw2 seen false
+      else
+        if check_ldap; then
+          STATE=end
+        else
+          db_fset ultrapossum-common/config_backend_ldap_failed seen false
+          db_input low ultrapossum-common/config_backend_ldap_failed
+          db_go
+          db_fset ultrapossum-common/config_backend_ldap_uri seen false
+          db_fset ultrapossum-common/config_backend_ldap_basedn seen false
+          db_fset ultrapossum-common/config_backend_ldap_binddn seen false
+          db_fset ultrapossum-common/config_backend_ldap_bindpw seen false
+          db_fset ultrapossum-common/config_backend_ldap_bindpw2 seen false
+          STATE=start
+        fi
+      fi
+    ;;
+  esac
+done
 
===================================================================
RCS file: ultrapossum/debian/ultrapossum-common.postinst,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ultrapossum/debian/ultrapossum-common.postinst	2004/05/13 15:41:31	1.5
+++ ultrapossum/debian/ultrapossum-common.postinst	2004/09/16 11:14:58	1.6
@@ -33,6 +33,14 @@
   fi
 }
 
+# setconfig <template_base> <var>
+setconfig_backend() {
+  db_get ultrapossum-common/$1
+  if test "x$RET" != "x${!2}"; then
+    ultrapossum_setconf_shell /etc/ultrapossum/config.cf $2 "$RET"
+  fi
+}
+
 case "$1" in
     configure)
 
@@ -50,6 +58,19 @@
 
 	setconfig suffix SUFFIX
 
+        db_get ultrapossum-common/config_backend
+        case "$RET" in
+          ldap)
+	    setconfig_backend config_backend ULTRAPOSSUM_CONFIG_BACKEND
+	    setconfig_backend config_backend_ldap_uri ULTRAPOSSUM_CONFIG_BACKEND_LDAP_URI
+	    setconfig_backend config_backend_ldap_basedn ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BASEDN
+	    setconfig_backend config_backend_ldap_binddn ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDDN
+	    setconfig_backend config_backend_ldap_bindpw ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDPW
+          ;;
+          *)
+            ultrapossum_setconf_shell /etc/ultrapossum/config.cf ULTRAPOSSUM_CONFIG_BACKEND ""
+          ;;
+        esac
 	chmod 1777 /var/cache/ultrapossum/
     ;;
 
===================================================================
RCS file: ultrapossum/debian/ultrapossum-common.templates,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ultrapossum/debian/ultrapossum-common.templates	2004/04/01 10:48:55	1.3
+++ ultrapossum/debian/ultrapossum-common.templates	2004/09/16 11:14:58	1.4
@@ -1,3 +1,39 @@
+Template: ultrapossum-common/config_backend
+Type: select
+Choices: file, ldap
+Default: file
+_Description: Which backend do you want to use to store configurations
+ UltraPossum stores your configuration in a configuration backend. You
+ can select the backend to use.
+
+Template: ultrapossum-common/config_backend_ldap_uri
+Type: string
+_Description: LDAP URI you connect
+
+Template: ultrapossum-common/config_backend_ldap_basedn
+Type: string
+_Description: BaseDN to search
+
+Template: ultrapossum-common/config_backend_ldap_binddn
+Type: string
+_Description: BindDN to search
+
+Template: ultrapossum-common/config_backend_ldap_bindpw
+Type: password
+_Description: password to search
+
+Template: ultrapossum-common/config_backend_ldap_bindpw2
+Type: password
+_Description: retype password to search
+
+Template: ultrapossum-common/config_backend_ldap_password_mismatch
+Type: Note
+_Description: password mismatch
+
+Template: ultrapossum-common/config_backend_ldap_failed
+Type: Note
+_Description: Configuration not found there
+
 Template: ultrapossum-common/suffix
 Type: string
 Default: o=ultrapossum


From taru ¡÷ users.sourceforge.jp  Thu Sep 16 20:14:58 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 16 Sep 2004 20:14:58 +0900
Subject: [Ultrapossum-cvs 432] ultrapossum/debian/po 1.9, 1.10, ja.po 1.8, 1.9,
	templates.pot
Message-ID: <20040916111458.ED1B22AC074@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/po/ja.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ultrapossum/debian/po/ja.po	2004/04/02 09:34:54	1.9
+++ ultrapossum/debian/po/ja.po	2004/09/16 11:14:58	1.10
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: ultrapossum 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-02 17:50+0900\n"
+"POT-Creation-Date: 2004-09-16 20:13+0900\n"
 "PO-Revision-Date: 2004-04-01 19:41+0900\n"
 "Last-Translator: Masato Taruishi <taru ¡÷ debian.org>\n"
 "Language-Team: Japanese <taru ¡÷ valinux.co.jp>\n"
@@ -23,15 +23,74 @@
 "Content-Type: text/plain; charset=eucJP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: select
+#. Description
+#: ../ultrapossum-common.templates:5
+msgid "Which backend do you want to use to store configurations"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../ultrapossum-common.templates:5
+msgid ""
+"UltraPossum stores your configuration in a configuration backend. You can "
+"select the backend to use."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ultrapossum-common.templates:11
+msgid "LDAP URI you connect"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ultrapossum-common.templates:15
+msgid "BaseDN to search"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ultrapossum-common.templates:19
+msgid "BindDN to search"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../ultrapossum-common.templates:23
+#, fuzzy
+msgid "password to search"
+msgstr "¥Ñ¥¹¥ï¡¼¥É¤¬°ìÃפ·¤Þ¤»¤ó"
+
+#. Type: password
+#. Description
+#: ../ultrapossum-common.templates:27
+#, fuzzy
+msgid "retype password to search"
+msgstr "¥ë¡¼¥ÈDN¤Î¥Ñ¥¹¥ï¡¼¥É(³Îǧ)"
+
+#. Type: Note
+#. Description
+#: ../ultrapossum-common.templates:31
+#, fuzzy
+msgid "password mismatch"
+msgstr "¥Ñ¥¹¥ï¡¼¥É¤¬°ìÃפ·¤Þ¤»¤ó"
+
+#. Type: Note
+#. Description
+#: ../ultrapossum-common.templates:35
+msgid "Configuration not found there"
+msgstr ""
+
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:4
+#: ../ultrapossum-common.templates:40
 msgid "Top level DN (Distungnished Name)"
 msgstr "ºÇ¾å°Ì DN (¼±ÊÌ̾)"
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:4
+#: ../ultrapossum-common.templates:40
 msgid ""
 "In LDAP, every entry has the unique identifier called DN (Distungnished "
 "Name). Because DN is tree structure, you need to specify the root entry "
@@ -40,19 +99,19 @@
 
 #. Type: boolean
 #. Description
-#: ../ultrapossum-common.templates:12
+#: ../ultrapossum-common.templates:48
 msgid "Your configuration is invalid. Continue to configure?"
 msgstr "ÀßÄ̵꤬¸ú¤Ç¤¹¡£ÀßÄê¤ò·Ñ³¤·¤Þ¤¹¤«?"
 
 #. Type: boolean
 #. Description
-#: ../ultrapossum-common.templates:12
+#: ../ultrapossum-common.templates:48
 msgid " ${description}"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../ultrapossum-common.templates:12
+#: ../ultrapossum-common.templates:48
 msgid ""
 "If you keep this configuration, ultrapossum probably will not work "
 "correctly. You can reconfigure it again instead of continuing to configure."
===================================================================
RCS file: ultrapossum/debian/po/templates.pot,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ultrapossum/debian/po/templates.pot	2004/04/02 09:34:54	1.8
+++ ultrapossum/debian/po/templates.pot	2004/09/16 11:14:58	1.9
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-02 17:50+0900\n"
+"POT-Creation-Date: 2004-09-16 20:13+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL ¡÷ ADDRESS>\n"
 "Language-Team: LANGUAGE <LL ¡÷ li.org>\n"
@@ -24,15 +24,71 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: select
+#. Description
+#: ../ultrapossum-common.templates:5
+msgid "Which backend do you want to use to store configurations"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../ultrapossum-common.templates:5
+msgid ""
+"UltraPossum stores your configuration in a configuration backend. You can "
+"select the backend to use."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ultrapossum-common.templates:11
+msgid "LDAP URI you connect"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ultrapossum-common.templates:15
+msgid "BaseDN to search"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ultrapossum-common.templates:19
+msgid "BindDN to search"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../ultrapossum-common.templates:23
+msgid "password to search"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../ultrapossum-common.templates:27
+msgid "retype password to search"
+msgstr ""
+
+#. Type: Note
+#. Description
+#: ../ultrapossum-common.templates:31
+msgid "password mismatch"
+msgstr ""
+
+#. Type: Note
+#. Description
+#: ../ultrapossum-common.templates:35
+msgid "Configuration not found there"
+msgstr ""
+
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:4
+#: ../ultrapossum-common.templates:40
 msgid "Top level DN (Distungnished Name)"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:4
+#: ../ultrapossum-common.templates:40
 msgid ""
 "In LDAP, every entry has the unique identifier called DN (Distungnished "
 "Name). Because DN is tree structure, you need to specify the root entry "
@@ -41,19 +97,19 @@
 
 #. Type: boolean
 #. Description
-#: ../ultrapossum-common.templates:12
+#: ../ultrapossum-common.templates:48
 msgid "Your configuration is invalid. Continue to configure?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../ultrapossum-common.templates:12
+#: ../ultrapossum-common.templates:48
 msgid " ${description}"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../ultrapossum-common.templates:12
+#: ../ultrapossum-common.templates:48
 msgid ""
 "If you keep this configuration, ultrapossum probably will not work "
 "correctly. You can reconfigure it again instead of continuing to configure."


From taru ¡÷ users.sourceforge.jp  Thu Sep 16 20:35:25 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 16 Sep 2004 20:35:25 +0900
Subject: [Ultrapossum-cvs 433] ultrapossum/debian 1.4, 1.5,
	ultrapossum-common.config
Message-ID: <20040916113525.0800C2AC06A@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/ultrapossum-common.config,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ultrapossum/debian/ultrapossum-common.config	2004/09/16 11:14:58	1.4
+++ ultrapossum/debian/ultrapossum-common.config	2004/09/16 11:35:24	1.5
@@ -23,7 +23,6 @@
   fi
 }
 
-SUFFIX="o=ultrapossum"
 if test -x "/usr/bin/ultrapossum-config"; then
   eval `/usr/bin/ultrapossum-config init`
   trap "eval `ultrapossum-config term`" 0
@@ -32,29 +31,33 @@
 fi
 
 if test "$1" = "reconfigure"; then
-  db_set ultrapossum-common/suffix $SUFFIX
+  db_set ultrapossum-common/suffix "$SUFFIX"
   db_set ultrapossum-common/config_backend_ldap_uri "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_URI"
   db_set ultrapossum-common/config_backend_ldap_basedn "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BASEDN"
   db_set ultrapossum-common/config_backend_ldap_binddn "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDDN"
   db_set ultrapossum-common/config_backend_ldap_bindpw "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDPW"
   db_set ultrapossum-common/config_backend_ldap_bindpw2 "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDPW"
-fi
 
-case "$ULTRAPOSSUM_CONFIG_BACKEND" in
-  ldap)
-    backend=ldap
-  ;;
-  *)
-    backend=file
-  ;;    
-esac
+  case "$ULTRAPOSSUM_CONFIG_BACKEND" in
+    ldap)
+      backend=ldap
+    ;;
+    *)
+      backend=file
+    ;;    
+  esac
 
-db_set ultrapossum-common/config_backend "$backend"
+  db_set ultrapossum-common/config_backend "$backend"
+fi
 
 STATE=start
 while test "$STATE" != "end"; do
   case "$STATE" in
     start)
+      db_input low ultrapossum-common/suffix
+      STATE=backend
+    ;;
+    backend)
       db_input low ultrapossum-common/config_backend || true
       db_go
       db_get ultrapossum-common/config_backend
@@ -98,7 +101,7 @@
           db_fset ultrapossum-common/config_backend_ldap_binddn seen false
           db_fset ultrapossum-common/config_backend_ldap_bindpw seen false
           db_fset ultrapossum-common/config_backend_ldap_bindpw2 seen false
-          STATE=start
+          STATE=backend
         fi
       fi
     ;;


From taru ¡÷ users.sourceforge.jp  Thu Sep 16 20:38:09 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 16 Sep 2004 20:38:09 +0900
Subject: [Ultrapossum-cvs 434] ultrapossum/debian 1.5, 1.6,
	ultrapossum-common.config
Message-ID: <20040916113809.1CD252AC06A@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/ultrapossum-common.config,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ultrapossum/debian/ultrapossum-common.config	2004/09/16 11:35:24	1.5
+++ ultrapossum/debian/ultrapossum-common.config	2004/09/16 11:38:09	1.6
@@ -54,7 +54,7 @@
 while test "$STATE" != "end"; do
   case "$STATE" in
     start)
-      db_input low ultrapossum-common/suffix
+      db_input low ultrapossum-common/suffix || true
       STATE=backend
     ;;
     backend)


From taru ¡÷ users.sourceforge.jp  Thu Sep 16 22:46:44 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 16 Sep 2004 22:46:44 +0900
Subject: [Ultrapossum-cvs 435] ultrapossum/debian ...
Message-ID: <20040916134644.8E3AD2AC03D@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/ultrapossum-common.config,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ultrapossum/debian/ultrapossum-common.config	2004/09/16 11:38:09	1.6
+++ ultrapossum/debian/ultrapossum-common.config	2004/09/16 13:46:44	1.7
@@ -5,6 +5,7 @@
 . /usr/share/debconf/confmodule
 
 db_version 2.0
+db_capb backup
 db_title "UltraPossum Configuration"
 
 check_ldap() {
@@ -26,12 +27,22 @@
 if test -x "/usr/bin/ultrapossum-config"; then
   eval `/usr/bin/ultrapossum-config init`
   trap "eval `ultrapossum-config term`" 0
-elif test -f "/etc/ultrapossum/ultrapossum.cf"; then
-  . /etc/ultrapossum/ultrapossum.cf
+else
+  # initial preconfiguration should come here
+  ORGANIZATION="`hostname`"
+  if test -f "/etc/ultrapossum/ultrapossum.cf"; then
+    . /etc/ultrapossum/ultrapossum.cf
+  fi
+  db_fget ultrapossum-common/organization seen
+  if test "x$RET" = "xfalse"; then
+    db_set ultrapossum-common/organization "$ORGANIZATION"
+  fi
 fi
 
+# In reconfiguration time, debconf must use system configuration value
 if test "$1" = "reconfigure"; then
   db_set ultrapossum-common/suffix "$SUFFIX"
+  db_set ultrapossum-common/organization "$ORGANIZATION"
   db_set ultrapossum-common/config_backend_ldap_uri "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_URI"
   db_set ultrapossum-common/config_backend_ldap_basedn "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BASEDN"
   db_set ultrapossum-common/config_backend_ldap_binddn "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDDN"
@@ -54,12 +65,13 @@
 while test "$STATE" != "end"; do
   case "$STATE" in
     start)
-      db_input low ultrapossum-common/suffix || true
       STATE=backend
     ;;
     backend)
       db_input low ultrapossum-common/config_backend || true
-      db_go
+      if ! db_go; then
+        exit 1
+      fi
       db_get ultrapossum-common/config_backend
       backend=$RET
       case "$backend" in
@@ -67,7 +79,13 @@
           STATE=ldapstart
         ;;
         *)
-          STATE=end
+          db_input low ultrapossum-common/organization || true
+          db_input low ultrapossum-common/suffix || true
+	  if ! db_go; then
+	    STATE=backend
+	  else
+            STATE=end
+	  fi
       esac
     ;;
     ldapstart)
@@ -79,29 +97,36 @@
     ldappasswd)
       db_input low ultrapossum-common/config_backend_ldap_bindpw || true
       db_input low ultrapossum-common/config_backend_ldap_bindpw2 || true
-      db_go
+      if ! db_go; then
+        STATE=backend
+      else
+        STATE=ldappasswd_check
+      fi
+    ;;
+    ldappasswd_check)
       db_get ultrapossum-common/config_backend_ldap_bindpw
       passwd="$RET"
       db_get ultrapossum-common/config_backend_ldap_bindpw2
       if test "x$passwd" != "x$RET"; then
         db_fset ultrapossum-common/config_backend_ldap_password_mismatch seen false
         db_input low ultrapossum-common/config_backend_ldap_password_mismatch
-        db_go
+        db_go || true
         db_fset ultrapossum-common/config_backend_ldap_bindpw seen false
         db_fset ultrapossum-common/config_backend_ldap_bindpw2 seen false
+	STATE=ldappasswd
       else
         if check_ldap; then
           STATE=end
         else
           db_fset ultrapossum-common/config_backend_ldap_failed seen false
           db_input low ultrapossum-common/config_backend_ldap_failed
-          db_go
+          db_go || true
           db_fset ultrapossum-common/config_backend_ldap_uri seen false
           db_fset ultrapossum-common/config_backend_ldap_basedn seen false
           db_fset ultrapossum-common/config_backend_ldap_binddn seen false
           db_fset ultrapossum-common/config_backend_ldap_bindpw seen false
           db_fset ultrapossum-common/config_backend_ldap_bindpw2 seen false
-          STATE=backend
+          STATE=ldapstart
         fi
       fi
     ;;
===================================================================
RCS file: ultrapossum/debian/ultrapossum-common.postinst,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ultrapossum/debian/ultrapossum-common.postinst	2004/09/16 11:14:58	1.6
+++ ultrapossum/debian/ultrapossum-common.postinst	2004/09/16 13:46:44	1.7
@@ -52,11 +52,13 @@
 	done
 
 	ultrapossum-config remove . SUFFIX
+	ultrapossum-config remove . ORGANIZATION
 
 	eval `ultrapossum-config init`
 	trap "eval `ultrapossum-config term`" 0
 
 	setconfig suffix SUFFIX
+	setconfig organization ORGANIZATION
 
         db_get ultrapossum-common/config_backend
         case "$RET" in
===================================================================
RCS file: ultrapossum/debian/ultrapossum-common.templates,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ultrapossum/debian/ultrapossum-common.templates	2004/09/16 11:14:58	1.4
+++ ultrapossum/debian/ultrapossum-common.templates	2004/09/16 13:46:44	1.5
@@ -4,18 +4,25 @@
 Default: file
 _Description: Which backend do you want to use to store configurations
  UltraPossum stores your configuration in a configuration backend. You
- can select the backend to use.
+ can select the backend to use. In most of cases, the backend 'file'
+ is the best choice. This backend holds configurations as file. If
+ you want to share configurations with ultrapossum servers, then you
+ may want to select ldap backend. This backend holds them in LDAP
+ directory.
 
 Template: ultrapossum-common/config_backend_ldap_uri
 Type: string
-_Description: LDAP URI you connect
+Default: ldap://localhost:389/
+_Description: LDAP URI where you connect
 
 Template: ultrapossum-common/config_backend_ldap_basedn
 Type: string
+Default: ou=config,o=ultrapossum
 _Description: BaseDN to search
 
 Template: ultrapossum-common/config_backend_ldap_binddn
 Type: string
+Default: cn=admin,o=ultrapossum
 _Description: BindDN to search
 
 Template: ultrapossum-common/config_backend_ldap_bindpw
@@ -41,6 +48,12 @@
  In LDAP, every entry has the unique identifier called DN (Distungnished Name).
  Because DN is tree structure, you need to specify the root entry
  which is called naming context.
+
+Template: ultrapossum-common/organization
+Type: string
+_Description: Which organization do you want to join?
+  Organization is domain of UltraPossum configuartion.
+  Configurations of all servers in a domain are shared.
 
 Template: ultrapossum-common/sanity
 Type: boolean
===================================================================
RCS file: ultrapossum/debian/ultrapossum-server.config,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ultrapossum/debian/ultrapossum-server.config	2004/09/07 12:17:13	1.20
+++ ultrapossum/debian/ultrapossum-server.config	2004/09/16 13:46:44	1.21
@@ -15,65 +15,67 @@
 if test -f "/usr/share/ultrapossum/module.d/10server"; then
   eval `/usr/bin/ultrapossum-config init`
   trap "/bin/rm -f $tmp; eval `ultrapossum-config term`" 0
-fi
-
-if test "$1" = "reconfigure"; then
 
-  # special care for passwd
-  ROOTPW=""
-  CREDENTIALS=""
-  if test -f "/etc/ultrapossum/secret.cf"; then
-    . /etc/ultrapossum/secret.cf
-  fi
+set() {
+  db_set "$1" "$2"
+}
 
 else
-
-  MASTER=${MASTER:-`hostname`}
-  DBDIRECTORY=${DBDIRECTORY:-"/var/lib/ultrapossum/db"}
-  if test -f "/etc/ultrapossum/ultrapossum.cf"; then
-    . /etc/ultrapossum/ultrapossum.cf
-  fi
-  if test -f "/etc/ultrapossum/module.d/server.cf"; then
-    . /etc/ultrapossum/module.d/server.cf
-  fi
-  if test -f "/etc/ultrapossum/secret.cf"; then
-    . /etc/ultrapossum/secret.cf
+  # initial configuration should come here
+  if test -x "/usr/bin/ultrapossum-config"; then
+    eval `/usr/bin/ultrapossum-config init`
+    trap "/bin/rm -f $tmp; eval `ultrapossum-config term`" 0
+  else
+    MASTER=${MASTER:-`hostname`}
+    DBDIRECTORY=${DBDIRECTORY:-"/var/lib/ultrapossum/db"}
+    ROOTPW=""
+    CREDENTIALS=""
+    if test -f "/etc/ultrapossum/ultrapossum.cf"; then
+      . /etc/ultrapossum/ultrapossum.cf
+    fi
+    if test -f "/etc/ultrapossum/module.d/server.cf"; then
+      . /etc/ultrapossum/module.d/server.cf
+    fi
+    if test -f "/etc/ultrapossum/secret.cf"; then
+      . /etc/ultrapossum/secret.cf
+    fi
   fi
-fi
 
-setdefault() {
-  if test "x${!1}" != "x"; then
-    db_set "$2" "${!1}"
+set() {
+  db_fget "$1" seen
+  if test "x$RET" = "xfalse"; then
+    db_set "$1" "$2"
   fi
 }
 
-setdefault SUFFIX ultrapossum-common/suffix
-setdefault ROOTRDN ultrapossum-server/rootrdn
-setdefault DBDIRECTORY ultrapossum-server/directory
-setdefault UPDATERDN ultrapossum-server/updaterdn
-setdefault MASTER ultrapossum-server/master
-setdefault SLURPDSLAVES ultrapossum-server/slaves
+fi
+
+set ultrapossum-common/organization "$ORGANIZATION"
+set ultrapossum-common/suffix "$SUFFIX"
+set ultrapossum-server/rootrdn "$ROOTRDN"
+set ultrapossum-server/directory "$DBDIRECTORY"
+set ultrapossum-server/updaterdn "$UPDATERDN"
+set ultrapossum-server/master "$MASTER"
+set ultrapossum-server/slaves "$SLURPDSLAVES"
 
-db_set ultrapossum-server/rootpw "$ROOTPW"
-db_set ultrapossum-server/rootpw2 "$ROOTPW"
+set ultrapossum-server/rootpw "$ROOTPW"
+set ultrapossum-server/rootpw2 "$ROOTPW"
 
 if test "x$MASTER" = "x" || test "x$MASTER" = "x`hostname`"; then
   if test "x$SLURPDSLAVES" = "x"; then
-    db_set ultrapossum-server/type standalone
+    set ultrapossum-server/type standalone
   else
-    db_set ultrapossum-server/type master
+    set ultrapossum-server/type master
   fi
 else
-  db_set ultrapossum-server/type slave
+  set ultrapossum-server/type slave
 fi
 
-db_set ultrapossum-server/credentials "$CREDENTIALS"
-db_set ultrapossum-server/credentials2 "$CREDENTIALS"
-setdefault RPLDIR ultrapossum-server/rpldir
-
-# if you don't have sanity checker (probably first time to install)
-# don't allow to edit
-if ! test -x "$UPDATEDIR/update-server"; then
+set ultrapossum-server/credentials "$CREDENTIALS"
+set ultrapossum-server/credentials2 "$CREDENTIALS"
+set ultrapossum-server/rpldir "$RPLDIR"
+
+if test "x$1" != "xreconfigure"; then
   exit 0
 fi
 
@@ -84,6 +86,8 @@
     t="$SYSCONFDIR/module.d/server.cf.debconf"
     touch $t
     chmod 600 $t
+    db_get ultrapossum-common/organization
+    echo "ORGANIZATION=$RET" > $t
     db_get ultrapossum-common/suffix
     echo "SUFFIX=$RET" > $t
     db_get ultrapossum-server/rootrdn
@@ -131,6 +135,7 @@
   case "$STATE" in
 
   SUFFIX)
+    db_input high ultrapossum-common/organization || true
     db_input medium ultrapossum-common/suffix || true
     db_input low ultrapossum-server/directory || true
     db_input medium ultrapossum-server/type || true
===================================================================
RCS file: ultrapossum/debian/ultrapossum-server.postinst,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ultrapossum/debian/ultrapossum-server.postinst	2004/07/09 06:48:34	1.25
+++ ultrapossum/debian/ultrapossum-server.postinst	2004/09/16 13:46:44	1.26
@@ -85,6 +85,7 @@
         eval `ultrapossum-config init`
 	trap "eval `ultrapossum-config term`" 0
 
+	setconfig organization ORGANIZATION
 	setconfig suffix SUFFIX
 #	setconfig backup BACKUP
 


From taru ¡÷ users.sourceforge.jp  Thu Sep 16 22:46:44 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 16 Sep 2004 22:46:44 +0900
Subject: [Ultrapossum-cvs 436] ultrapossum/debian/po 1.10, 1.11, ja.po 1.9,
	1.10, templates.pot
Message-ID: <20040916134644.A9AD62AC04D@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/po/ja.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ultrapossum/debian/po/ja.po	2004/09/16 11:14:58	1.10
+++ ultrapossum/debian/po/ja.po	2004/09/16 13:46:44	1.11
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: ultrapossum 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-16 20:13+0900\n"
+"POT-Creation-Date: 2004-09-16 21:40+0900\n"
 "PO-Revision-Date: 2004-04-01 19:41+0900\n"
 "Last-Translator: Masato Taruishi <taru ¡÷ debian.org>\n"
 "Language-Team: Japanese <taru ¡÷ valinux.co.jp>\n"
@@ -34,84 +34,101 @@
 #: ../ultrapossum-common.templates:5
 msgid ""
 "UltraPossum stores your configuration in a configuration backend. You can "
-"select the backend to use."
+"select the backend to use. In most of cases, the backend 'file' is the best "
+"choice. This backend holds configurations as file. If you want to share "
+"configurations with ultrapossum servers, then you may want to select ldap "
+"backend. This backend holds them in LDAP directory."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:11
-msgid "LDAP URI you connect"
+#: ../ultrapossum-common.templates:16
+msgid "LDAP URI where you connect"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:15
+#: ../ultrapossum-common.templates:21
 msgid "BaseDN to search"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:19
+#: ../ultrapossum-common.templates:26
 msgid "BindDN to search"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../ultrapossum-common.templates:23
+#: ../ultrapossum-common.templates:30
 #, fuzzy
 msgid "password to search"
 msgstr "¥Ñ¥¹¥ï¡¼¥É¤¬°ìÃפ·¤Þ¤»¤ó"
 
 #. Type: password
 #. Description
-#: ../ultrapossum-common.templates:27
+#: ../ultrapossum-common.templates:34
 #, fuzzy
 msgid "retype password to search"
 msgstr "¥ë¡¼¥ÈDN¤Î¥Ñ¥¹¥ï¡¼¥É(³Îǧ)"
 
 #. Type: Note
 #. Description
-#: ../ultrapossum-common.templates:31
+#: ../ultrapossum-common.templates:38
 #, fuzzy
 msgid "password mismatch"
 msgstr "¥Ñ¥¹¥ï¡¼¥É¤¬°ìÃפ·¤Þ¤»¤ó"
 
 #. Type: Note
 #. Description
-#: ../ultrapossum-common.templates:35
+#: ../ultrapossum-common.templates:42
 msgid "Configuration not found there"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:40
+#: ../ultrapossum-common.templates:47
 msgid "Top level DN (Distungnished Name)"
 msgstr "ºÇ¾å°Ì DN (¼±ÊÌ̾)"
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:40
+#: ../ultrapossum-common.templates:47
 msgid ""
 "In LDAP, every entry has the unique identifier called DN (Distungnished "
 "Name). Because DN is tree structure, you need to specify the root entry "
 "which is called naming context."
 msgstr "LDAP ¤Ë¤Ï¡¢Á´¤Æ¤Î¥¨¥ó¥È¥ê¤Ë DN (¼±ÊÌ̾) ¤È¸Æ¤Ð¤ì¤ë°ì°Õ¤Ê¼±Ê̻Ҥ¬¤¢¤ê¤Þ¤¹¡£DN ¤ÏÌÚ¹½Â¤¤Ç¤¢¤ë¤¿¤á¡¢¥ë¡¼¥È¥¨¥ó¥È¥ê¤Î¼±ÊÌ̾¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹(̿̾¥³¥ó¥Æ¥­¥¹¥È¤È¸Æ¤Ð¤ì¤ë¤â¤Î¤Ç¤¹)¡£"
 
+#. Type: string
+#. Description
+#: ../ultrapossum-common.templates:54
+msgid "Which organization do you want to join?"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ultrapossum-common.templates:54
+msgid ""
+" Organization is domain of UltraPossum configuartion.\n"
+" Configurations of all servers in a domain are shared."
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../ultrapossum-common.templates:48
+#: ../ultrapossum-common.templates:61
 msgid "Your configuration is invalid. Continue to configure?"
 msgstr "ÀßÄ̵꤬¸ú¤Ç¤¹¡£ÀßÄê¤ò·Ñ³¤·¤Þ¤¹¤«?"
 
 #. Type: boolean
 #. Description
-#: ../ultrapossum-common.templates:48
+#: ../ultrapossum-common.templates:61
 msgid " ${description}"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../ultrapossum-common.templates:48
+#: ../ultrapossum-common.templates:61
 msgid ""
 "If you keep this configuration, ultrapossum probably will not work "
 "correctly. You can reconfigure it again instead of continuing to configure."
===================================================================
RCS file: ultrapossum/debian/po/templates.pot,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ultrapossum/debian/po/templates.pot	2004/09/16 11:14:58	1.9
+++ ultrapossum/debian/po/templates.pot	2004/09/16 13:46:44	1.10
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-16 20:13+0900\n"
+"POT-Creation-Date: 2004-09-16 21:40+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL ¡÷ ADDRESS>\n"
 "Language-Team: LANGUAGE <LL ¡÷ li.org>\n"
@@ -35,81 +35,98 @@
 #: ../ultrapossum-common.templates:5
 msgid ""
 "UltraPossum stores your configuration in a configuration backend. You can "
-"select the backend to use."
+"select the backend to use. In most of cases, the backend 'file' is the best "
+"choice. This backend holds configurations as file. If you want to share "
+"configurations with ultrapossum servers, then you may want to select ldap "
+"backend. This backend holds them in LDAP directory."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:11
-msgid "LDAP URI you connect"
+#: ../ultrapossum-common.templates:16
+msgid "LDAP URI where you connect"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:15
+#: ../ultrapossum-common.templates:21
 msgid "BaseDN to search"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:19
+#: ../ultrapossum-common.templates:26
 msgid "BindDN to search"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../ultrapossum-common.templates:23
+#: ../ultrapossum-common.templates:30
 msgid "password to search"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../ultrapossum-common.templates:27
+#: ../ultrapossum-common.templates:34
 msgid "retype password to search"
 msgstr ""
 
 #. Type: Note
 #. Description
-#: ../ultrapossum-common.templates:31
+#: ../ultrapossum-common.templates:38
 msgid "password mismatch"
 msgstr ""
 
 #. Type: Note
 #. Description
-#: ../ultrapossum-common.templates:35
+#: ../ultrapossum-common.templates:42
 msgid "Configuration not found there"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:40
+#: ../ultrapossum-common.templates:47
 msgid "Top level DN (Distungnished Name)"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:40
+#: ../ultrapossum-common.templates:47
 msgid ""
 "In LDAP, every entry has the unique identifier called DN (Distungnished "
 "Name). Because DN is tree structure, you need to specify the root entry "
 "which is called naming context."
 msgstr ""
 
+#. Type: string
+#. Description
+#: ../ultrapossum-common.templates:54
+msgid "Which organization do you want to join?"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ultrapossum-common.templates:54
+msgid ""
+" Organization is domain of UltraPossum configuartion.\n"
+" Configurations of all servers in a domain are shared."
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../ultrapossum-common.templates:48
+#: ../ultrapossum-common.templates:61
 msgid "Your configuration is invalid. Continue to configure?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../ultrapossum-common.templates:48
+#: ../ultrapossum-common.templates:61
 msgid " ${description}"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../ultrapossum-common.templates:48
+#: ../ultrapossum-common.templates:61
 msgid ""
 "If you keep this configuration, ultrapossum probably will not work "
 "correctly. You can reconfigure it again instead of continuing to configure."


From taru ¡÷ users.sourceforge.jp  Thu Sep 16 22:46:44 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 16 Sep 2004 22:46:44 +0900
Subject: [Ultrapossum-cvs 437] ultrapossum/init.d 1.1, 1.2, 15variable 1.1, 1.2,
	30logical
Message-ID: <20040916134644.C2C2B2AC054@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/init.d/15variable,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ultrapossum/init.d/15variable	2004/09/15 12:17:50	1.1
+++ ultrapossum/init.d/15variable	2004/09/16 13:46:44	1.2
@@ -2,7 +2,7 @@
 
 if test "x$cache" = "x"; then
 
-HOST=${HOST:-`hostname`}
+HOST="`hostname`"
 
 DBNAME=`ultrapossum_getconf DBNAME ultrapossum`
 ORGANIZATION=`ultrapossum_getconf ORGANIZATION $HOST`
===================================================================
RCS file: ultrapossum/init.d/30logical,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ultrapossum/init.d/30logical	2004/09/15 12:17:50	1.1
+++ ultrapossum/init.d/30logical	2004/09/16 13:46:44	1.2
@@ -1,14 +1,12 @@
 # Building Logical Variables
-if test "x$TYPE" = "x"; then
-  TYPE=client
-  if test "x$MASTER" = "x$HOST" || include "$HOST" "$SYNCBACKUPS"; then
-    TYPE=master
-  else
-    for s in $SLAVES
-    do
-      if test "x$s" = "x$HOST"; then
-        TYPE=slave
-      fi
-    done
-  fi
+TYPE=client
+if test "x$MASTER" = "x$HOST" || test "x$BACKUP" = "x$HOST" || include "$HOST" "$SYNCBACKUPS"; then
+  TYPE=master
+else
+  for s in $SLAVES
+  do
+    if test "x$s" = "x$HOST"; then
+      TYPE=slave
+    fi
+  done
 fi


From taru ¡÷ users.sourceforge.jp  Thu Sep 16 22:52:30 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 16 Sep 2004 22:52:30 +0900
Subject: [Ultrapossum-cvs 438] ultrapossum/debian 1.48,1.49,changelog
Message-ID: <20040916135230.2B8652AC03D@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/changelog,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- ultrapossum/debian/changelog	2004/09/16 08:00:46	1.48
+++ ultrapossum/debian/changelog	2004/09/16 13:52:30	1.49
@@ -1,3 +1,10 @@
+ultrapossum (0.1beta8-0pre2) unstable; urgency=low
+
+  * Applied the latest upstream version.
+  * more better debconf handling
+
+ -- Masato Taruishi <taru ¡÷ valinux.co.jp>  Thu, 16 Sep 2004 22:50:33 +0900
+
 ultrapossum (0.1beta8-0pre1) unstable; urgency=low
 
   * New upstream release.


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 00:43:39 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 00:43:39 +0900
Subject: [Ultrapossum-cvs 439] ultrapossum/debian 1.21, 1.22,
	ultrapossum-server.config
Message-ID: <20040916154339.161BA2AC03D@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/ultrapossum-server.config,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ultrapossum/debian/ultrapossum-server.config	2004/09/16 13:46:44	1.21
+++ ultrapossum/debian/ultrapossum-server.config	2004/09/16 15:43:39	1.22
@@ -12,42 +12,37 @@
 trap "/bin/rm -f $tmp" 0
 chmod 600 $tmp
 
-if test -f "/usr/share/ultrapossum/module.d/10server"; then
+if test -x "/usr/bin/ultrapossum-config"; then
   eval `/usr/bin/ultrapossum-config init`
   trap "/bin/rm -f $tmp; eval `ultrapossum-config term`" 0
-
-set() {
-  db_set "$1" "$2"
-}
-
 else
   # initial configuration should come here
-  if test -x "/usr/bin/ultrapossum-config"; then
-    eval `/usr/bin/ultrapossum-config init`
-    trap "/bin/rm -f $tmp; eval `ultrapossum-config term`" 0
-  else
-    MASTER=${MASTER:-`hostname`}
-    DBDIRECTORY=${DBDIRECTORY:-"/var/lib/ultrapossum/db"}
-    ROOTPW=""
-    CREDENTIALS=""
-    if test -f "/etc/ultrapossum/ultrapossum.cf"; then
-      . /etc/ultrapossum/ultrapossum.cf
-    fi
-    if test -f "/etc/ultrapossum/module.d/server.cf"; then
-      . /etc/ultrapossum/module.d/server.cf
-    fi
-    if test -f "/etc/ultrapossum/secret.cf"; then
-      . /etc/ultrapossum/secret.cf
-    fi
+  MASTER=${MASTER:-`hostname`}
+  DBDIRECTORY=${DBDIRECTORY:-"/var/lib/ultrapossum/db"}
+  ROOTPW=""
+  CREDENTIALS=""
+  if test -f "/etc/ultrapossum/ultrapossum.cf"; then
+    . /etc/ultrapossum/ultrapossum.cf
   fi
-
-set() {
-  db_fget "$1" seen
-  if test "x$RET" = "xfalse"; then
-    db_set "$1" "$2"
+  if test -f "/etc/ultrapossum/module.d/server.cf"; then
+    . /etc/ultrapossum/module.d/server.cf
+  fi
+  if test -f "/etc/ultrapossum/secret.cf"; then
+    . /etc/ultrapossum/secret.cf
   fi
-}
+fi
 
+if test "x$1" = "xreconfigure"; then
+  set() {
+    db_set "$1" "$2"
+  }
+else
+  set() {
+    db_fget "$1" seen
+    if test "x$RET" = "xfalse"; then
+      db_set "$1" "$2"
+    fi
+  }
 fi
 
 set ultrapossum-common/organization "$ORGANIZATION"


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 00:56:29 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 00:56:29 +0900
Subject: [Ultrapossum-cvs 440] ultrapossum/debian 1.7, 1.8,
	ultrapossum-common.config
Message-ID: <20040916155629.E80942AC03D@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/ultrapossum-common.config,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ultrapossum/debian/ultrapossum-common.config	2004/09/16 13:46:44	1.7
+++ ultrapossum/debian/ultrapossum-common.config	2004/09/16 15:56:29	1.8
@@ -33,33 +33,40 @@
   if test -f "/etc/ultrapossum/ultrapossum.cf"; then
     . /etc/ultrapossum/ultrapossum.cf
   fi
-  db_fget ultrapossum-common/organization seen
-  if test "x$RET" = "xfalse"; then
-    db_set ultrapossum-common/organization "$ORGANIZATION"
-  fi
 fi
 
 # In reconfiguration time, debconf must use system configuration value
-if test "$1" = "reconfigure"; then
-  db_set ultrapossum-common/suffix "$SUFFIX"
-  db_set ultrapossum-common/organization "$ORGANIZATION"
-  db_set ultrapossum-common/config_backend_ldap_uri "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_URI"
-  db_set ultrapossum-common/config_backend_ldap_basedn "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BASEDN"
-  db_set ultrapossum-common/config_backend_ldap_binddn "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDDN"
-  db_set ultrapossum-common/config_backend_ldap_bindpw "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDPW"
-  db_set ultrapossum-common/config_backend_ldap_bindpw2 "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDPW"
+if test "x$1" = "xreconfigure"; then
+  set() {
+    db_set "$1" "$2"
+  }
+else
+  set() {
+    db_fget "$1" seen
+    if test "x$RET" = "xfalse"; then
+      db_set "$1" "$2"
+    fi
+  }
+fi
 
-  case "$ULTRAPOSSUM_CONFIG_BACKEND" in
-    ldap)
-      backend=ldap
-    ;;
-    *)
-      backend=file
-    ;;    
-  esac
+set ultrapossum-common/suffix "$SUFFIX"
+set ultrapossum-common/organization "$ORGANIZATION"
+set ultrapossum-common/config_backend_ldap_uri "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_URI"
+set ultrapossum-common/config_backend_ldap_basedn "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BASEDN"
+set ultrapossum-common/config_backend_ldap_binddn "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDDN"
+set ultrapossum-common/config_backend_ldap_bindpw "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDPW"
+set ultrapossum-common/config_backend_ldap_bindpw2 "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDPW"
 
-  db_set ultrapossum-common/config_backend "$backend"
-fi
+case "$ULTRAPOSSUM_CONFIG_BACKEND" in
+  ldap)
+    backend=ldap
+  ;;
+  *)
+    backend=file
+  ;;    
+esac
+
+set ultrapossum-common/config_backend "$backend"
 
 STATE=start
 while test "$STATE" != "end"; do
@@ -79,7 +86,7 @@
           STATE=ldapstart
         ;;
         *)
-          db_input low ultrapossum-common/organization || true
+          db_input medium ultrapossum-common/organization || true
           db_input low ultrapossum-common/suffix || true
 	  if ! db_go; then
 	    STATE=backend


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 00:57:10 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 00:57:10 +0900
Subject: [Ultrapossum-cvs 441] demo/uml/debian 1.3,1.4,templates
Message-ID: <20040916155710.E95472AC01A@users.sourceforge.jp>

===================================================================
RCS file: demo/uml/debian/templates,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- demo/uml/debian/templates	2004/07/09 02:45:52	1.3
+++ demo/uml/debian/templates	2004/09/16 15:57:10	1.4
@@ -12,7 +12,7 @@
 
 Template: ultrapossum-uml/uml_mem
 Type: string
-Description: How many memories do you want to allocate for a virtual server?
+Description: How much memories do you want to allocate for a virtual server?
 
 Template: ultrapossum-uml/uml_mirror_candidates
 Type: select


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 01:05:52 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 01:05:52 +0900
Subject: [Ultrapossum-cvs 442] ultrapossum 1.1.1.1,1.2,config.cf
Message-ID: <20040916160552.85AA12AC01A@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/config.cf,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ultrapossum/config.cf	2004/03/13 14:25:52	1.1.1.1
+++ ultrapossum/config.cf	2004/09/16 16:05:52	1.2
@@ -7,7 +7,7 @@
 ### LDAP backend specific configuration
 ###
 
-ULTRAPOSSUM_CONFIG_BACKEND_LDAP_URI="ldap://localhost:389/"
+ULTRAPOSSUM_CONFIG_BACKEND_LDAP_URI=""
 ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BASEDN=""
 ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDDN=""
 ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDPW=""


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 01:05:52 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 01:05:52 +0900
Subject: [Ultrapossum-cvs 443] ultrapossum/debian ...
Message-ID: <20040916160552.A68962AC03D@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/ultrapossum-common.config,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ultrapossum/debian/ultrapossum-common.config	2004/09/16 15:56:29	1.8
+++ ultrapossum/debian/ultrapossum-common.config	2004/09/16 16:05:52	1.9
@@ -30,8 +30,12 @@
 else
   # initial preconfiguration should come here
   ORGANIZATION="`hostname`"
+  ULTRAPOSSUM_CONFIG_BACKEND_LDAP_URI="ldap://$ORGANIZATION/"
   if test -f "/etc/ultrapossum/ultrapossum.cf"; then
     . /etc/ultrapossum/ultrapossum.cf
+  fi
+  if test -f "/etc/ultrapossum/config.cf"; then
+    . /etc/ultrapossum/config.cf
   fi
 fi
 
===================================================================
RCS file: ultrapossum/debian/ultrapossum-common.templates,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ultrapossum/debian/ultrapossum-common.templates	2004/09/16 13:46:44	1.5
+++ ultrapossum/debian/ultrapossum-common.templates	2004/09/16 16:05:52	1.6
@@ -12,7 +12,6 @@
 
 Template: ultrapossum-common/config_backend_ldap_uri
 Type: string
-Default: ldap://localhost:389/
 _Description: LDAP URI where you connect
 
 Template: ultrapossum-common/config_backend_ldap_basedn


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 01:05:52 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 01:05:52 +0900
Subject: [Ultrapossum-cvs 444] ultrapossum/debian/po 1.11, 1.12, ja.po 1.10,
	1.11, templates.pot
Message-ID: <20040916160552.BFD312AC04D@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/po/ja.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ultrapossum/debian/po/ja.po	2004/09/16 13:46:44	1.11
+++ ultrapossum/debian/po/ja.po	2004/09/16 16:05:52	1.12
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: ultrapossum 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-16 21:40+0900\n"
+"POT-Creation-Date: 2004-09-17 01:02+0900\n"
 "PO-Revision-Date: 2004-04-01 19:41+0900\n"
 "Last-Translator: Masato Taruishi <taru ¡÷ debian.org>\n"
 "Language-Team: Japanese <taru ¡÷ valinux.co.jp>\n"
@@ -42,58 +42,58 @@
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:16
+#: ../ultrapossum-common.templates:15
 msgid "LDAP URI where you connect"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:21
+#: ../ultrapossum-common.templates:20
 msgid "BaseDN to search"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:26
+#: ../ultrapossum-common.templates:25
 msgid "BindDN to search"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../ultrapossum-common.templates:30
+#: ../ultrapossum-common.templates:29
 #, fuzzy
 msgid "password to search"
 msgstr "¥Ñ¥¹¥ï¡¼¥É¤¬°ìÃפ·¤Þ¤»¤ó"
 
 #. Type: password
 #. Description
-#: ../ultrapossum-common.templates:34
+#: ../ultrapossum-common.templates:33
 #, fuzzy
 msgid "retype password to search"
 msgstr "¥ë¡¼¥ÈDN¤Î¥Ñ¥¹¥ï¡¼¥É(³Îǧ)"
 
 #. Type: Note
 #. Description
-#: ../ultrapossum-common.templates:38
+#: ../ultrapossum-common.templates:37
 #, fuzzy
 msgid "password mismatch"
 msgstr "¥Ñ¥¹¥ï¡¼¥É¤¬°ìÃפ·¤Þ¤»¤ó"
 
 #. Type: Note
 #. Description
-#: ../ultrapossum-common.templates:42
+#: ../ultrapossum-common.templates:41
 msgid "Configuration not found there"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:47
+#: ../ultrapossum-common.templates:46
 msgid "Top level DN (Distungnished Name)"
 msgstr "ºÇ¾å°Ì DN (¼±ÊÌ̾)"
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:47
+#: ../ultrapossum-common.templates:46
 msgid ""
 "In LDAP, every entry has the unique identifier called DN (Distungnished "
 "Name). Because DN is tree structure, you need to specify the root entry "
@@ -102,13 +102,13 @@
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:54
+#: ../ultrapossum-common.templates:53
 msgid "Which organization do you want to join?"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:54
+#: ../ultrapossum-common.templates:53
 msgid ""
 " Organization is domain of UltraPossum configuartion.\n"
 " Configurations of all servers in a domain are shared."
@@ -116,19 +116,19 @@
 
 #. Type: boolean
 #. Description
-#: ../ultrapossum-common.templates:61
+#: ../ultrapossum-common.templates:60
 msgid "Your configuration is invalid. Continue to configure?"
 msgstr "ÀßÄ̵꤬¸ú¤Ç¤¹¡£ÀßÄê¤ò·Ñ³¤·¤Þ¤¹¤«?"
 
 #. Type: boolean
 #. Description
-#: ../ultrapossum-common.templates:61
+#: ../ultrapossum-common.templates:60
 msgid " ${description}"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../ultrapossum-common.templates:61
+#: ../ultrapossum-common.templates:60
 msgid ""
 "If you keep this configuration, ultrapossum probably will not work "
 "correctly. You can reconfigure it again instead of continuing to configure."
===================================================================
RCS file: ultrapossum/debian/po/templates.pot,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ultrapossum/debian/po/templates.pot	2004/09/16 13:46:44	1.10
+++ ultrapossum/debian/po/templates.pot	2004/09/16 16:05:52	1.11
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-16 21:40+0900\n"
+"POT-Creation-Date: 2004-09-17 01:02+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL ¡÷ ADDRESS>\n"
 "Language-Team: LANGUAGE <LL ¡÷ li.org>\n"
@@ -43,55 +43,55 @@
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:16
+#: ../ultrapossum-common.templates:15
 msgid "LDAP URI where you connect"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:21
+#: ../ultrapossum-common.templates:20
 msgid "BaseDN to search"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:26
+#: ../ultrapossum-common.templates:25
 msgid "BindDN to search"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../ultrapossum-common.templates:30
+#: ../ultrapossum-common.templates:29
 msgid "password to search"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../ultrapossum-common.templates:34
+#: ../ultrapossum-common.templates:33
 msgid "retype password to search"
 msgstr ""
 
 #. Type: Note
 #. Description
-#: ../ultrapossum-common.templates:38
+#: ../ultrapossum-common.templates:37
 msgid "password mismatch"
 msgstr ""
 
 #. Type: Note
 #. Description
-#: ../ultrapossum-common.templates:42
+#: ../ultrapossum-common.templates:41
 msgid "Configuration not found there"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:47
+#: ../ultrapossum-common.templates:46
 msgid "Top level DN (Distungnished Name)"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:47
+#: ../ultrapossum-common.templates:46
 msgid ""
 "In LDAP, every entry has the unique identifier called DN (Distungnished "
 "Name). Because DN is tree structure, you need to specify the root entry "
@@ -100,13 +100,13 @@
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:54
+#: ../ultrapossum-common.templates:53
 msgid "Which organization do you want to join?"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:54
+#: ../ultrapossum-common.templates:53
 msgid ""
 " Organization is domain of UltraPossum configuartion.\n"
 " Configurations of all servers in a domain are shared."
@@ -114,19 +114,19 @@
 
 #. Type: boolean
 #. Description
-#: ../ultrapossum-common.templates:61
+#: ../ultrapossum-common.templates:60
 msgid "Your configuration is invalid. Continue to configure?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../ultrapossum-common.templates:61
+#: ../ultrapossum-common.templates:60
 msgid " ${description}"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../ultrapossum-common.templates:61
+#: ../ultrapossum-common.templates:60
 msgid ""
 "If you keep this configuration, ultrapossum probably will not work "
 "correctly. You can reconfigure it again instead of continuing to configure."


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 03:30:12 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 03:30:12 +0900
Subject: [Ultrapossum-cvs 445] ultrapossum 1.40,1.41,configure.in
Message-ID: <20040916183012.EA1332AC012@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/configure.in,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ultrapossum/configure.in	2004/09/16 07:45:53	1.40
+++ ultrapossum/configure.in	2004/09/16 18:30:12	1.41
@@ -155,18 +155,19 @@
 	.,
 [change default directory where openldap backend modules are located])
 
+  UP_DIRECTORY(opensslsysconfdir,
+    	/etc/openssl /etc/ssl /usr/local/etc/ssl /usr/local/etc/openssl,
+	openssl.cnf,
+[change default directory where openssl.cnf is located])
+
   AC_MSG_CHECKING(whether slapd supports SSL/TLS)
-  if ldd $ldaplibexecdir/slapd | grep libssl > /dev/null ||
-    ldd $ldaplibexecdir/slapd | grep gnutls > /dev/null
+  if ldd $ldaplibexecdir/slapd 2> /dev/null | grep libssl > /dev/null ||
+    ldd $ldaplibexecdir/slapd 2> /dev/null | grep gnutls > /dev/null
   then
     AC_MSG_RESULT(ok)
     if test "x$automodules" != "x" && ! include "startTLS" "$modules"; then
       modules="$modules startTLS" 
     fi
-    UP_DIRECTORY(opensslsysconfdir,
-    	/etc/openssl /etc/ssl /usr/local/etc/ssl /usr/local/etc/openssl,
-	openssl.cnf,
-[change default directory where openssl.cnf is located])
   else
     AC_MSG_RESULT(no)
   fi


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 03:30:13 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 03:30:13 +0900
Subject: [Ultrapossum-cvs 446] ultrapossum/module/failover ...
Message-ID: <20040916183013.3E02D2AC01A@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/failover/11failover,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ultrapossum/module/failover/11failover	2004/08/04 17:08:31	1.2
+++ ultrapossum/module/failover/11failover	2004/09/16 18:30:13	1.3
@@ -62,7 +62,12 @@
 
 if test "x$cache" = "x"; then
 
+if test "x$VIRTUAL" != "x"; then
+  LDAPMASTER="$VIRTUAL"
+fi
+
 if test "x$BACKUP" != "x" && test "x$NFSDIR" != "x"; then
+  LOCAL_REPLOGFILE=$REPLOGFILE
   REPLOGFILE=$NFSDIR/$RPLDIR/$HOST/replog
 fi
 
===================================================================
RCS file: ultrapossum/module/failover/update-failover,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ultrapossum/module/failover/update-failover	2004/07/09 06:49:07	1.10
+++ ultrapossum/module/failover/update-failover	2004/09/16 18:30:13	1.11
@@ -159,6 +159,11 @@
         echo "E: In order to use a failover backup server, need to set NFSDIR or set nice_failback on in ha.cf" 1>&2
         sanity_error=1
       fi
+    else
+      if test -f "$LOCAL_REPLOGFILE"; then
+        echo "E: Replication has been already started." 1>&2
+        sanity_error=1
+      fi
     fi
   fi
   if test "$sanity_error" != "0"; then


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 03:30:13 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 03:30:13 +0900
Subject: [Ultrapossum-cvs 447] ultrapossum/debian ...
Message-ID: <20040916183013.273A42AC017@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/ultrapossum-common.postinst,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ultrapossum/debian/ultrapossum-common.postinst	2004/09/16 13:46:44	1.7
+++ ultrapossum/debian/ultrapossum-common.postinst	2004/09/16 18:30:12	1.8
@@ -43,16 +43,26 @@
 
 case "$1" in
     configure)
+	ultrapossum-config remove . SUFFIX
+	ultrapossum-config remove . ORGANIZATION
 
-	for f in ultrapossum.cf config.cf debian.cf secret.cf
+        db_get ultrapossum-common/config_backend
+	case "$RET" in
+	  ldap)
+	    :
+	  ;;
+	  *)
+	    install -d /etc/ultrapossum/
+	    ucf /usr/share/ultrapossum/ucf/ultrapossum/ultrapossum.cf \
+			/etc/ultrapossum/ultrapossum.cf
+	  ;;
+	esac
+	for f in config.cf debian.cf secret.cf
 	do
 	        install -d `dirname /etc/ultrapossum/$f`
 		ucf /usr/share/ultrapossum/ucf/ultrapossum/$f \
 			/etc/ultrapossum/$f
 	done
-
-	ultrapossum-config remove . SUFFIX
-	ultrapossum-config remove . ORGANIZATION
 
 	eval `ultrapossum-config init`
 	trap "eval `ultrapossum-config term`" 0
===================================================================
RCS file: ultrapossum/debian/ultrapossum-dnsbalance.postinst,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ultrapossum/debian/ultrapossum-dnsbalance.postinst	2004/03/26 07:59:10	1.4
+++ ultrapossum/debian/ultrapossum-dnsbalance.postinst	2004/09/16 18:30:12	1.5
@@ -25,8 +25,6 @@
 
 case "$1" in
     configure)
-        eval `ultrapossum-config init`
-        trap "eval `ultrapossum-config term`" 0
     	echo -n "Configuring UltraPossum DNS recoreds... " 1>&2
 	$UPDATEDIR/update-dnsbalance configure
 	echo "done"
===================================================================
RCS file: ultrapossum/debian/ultrapossum-failover.config,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ultrapossum/debian/ultrapossum-failover.config	2004/03/26 07:59:10	1.3
+++ ultrapossum/debian/ultrapossum-failover.config	2004/09/16 18:30:12	1.4
@@ -7,14 +7,44 @@
 db_version 2.0
 
 if test -x "/usr/bin/ultrapossum-config"; then
-
   eval `/usr/bin/ultrapossum-config init`
   trap "eval `ultrapossum-config term`" 0
+else
+  if test -f "/etc/ultrapossum/ultrapossum.cf"; then
+    . /etc/ultrapossum/ultrapossum.cf
+  fi
+  if test -f "/etc/ultrapossum/module.d/failover.cf"; then
+    . /etc/ultrapossum/module.d/failover.cf
+  fi
+fi
 
-  db_set ultrapossum-failover/nfsdir $NFSDIR
-
+if test "x$1" = "xreconfigure"; then
+  set() {
+    db_set "$1" "$2"
+  }
+else
+  set() {
+    db_fget "$1" seen
+    if test "x$RET" = "xfalse"; then
+      db_set "$1" "$2"
+    fi
+  }
 fi
 
-db_input high ultrapossum-failover/nfsdir || true
+set ultrapossum-failover/backup $BACKUP
+set ultrapossum-failover/nfsdir $NFSDIR
+
+slaves=`echo $SLAVES | sed 's/ /, /g'`
+db_subst ultrapossum-failover/backup slaves "$slaves"
+db_input high ultrapossum-failover/backup || true
 db_go || true
+
+db_get ultrapossum-failover/backup
+if include "$RET" "$SLURPDSLAVES"; then
+  db_input high ultrapossum-failover/nfsdir || true
+  db_go || true
+else
+  db_set ultrapossum-failover/nfsdir ""
+  db_fset ultrapossum-failover/nfsdir seen true
+fi
 
===================================================================
RCS file: ultrapossum/debian/ultrapossum-failover.postinst,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ultrapossum/debian/ultrapossum-failover.postinst	2004/05/13 15:50:12	1.7
+++ ultrapossum/debian/ultrapossum-failover.postinst	2004/09/16 18:30:12	1.8
@@ -37,7 +37,22 @@
 
 case "$1" in
     configure)
-	for f in module.d/failover.cf in.d/authkeys.in \
+        ultrapossum-config remove failover NFSDIR BACKUP
+
+        eval `ultrapossum-config init`
+        trap "eval `ultrapossum-config term`" 0
+
+	case "$ULTRAPOSSUM_CONFIG_BACKEND" in
+	  ldap)
+	    :
+	  ;;
+	  *)
+	    install -d /etc/ultrapossum/module.d
+	    ucf /usr/share/ultrapossum/ucf/ultrapossum/module.d/failover.cf \
+	  	/etc/ultrapossum/module.d/failover.cf
+	  ;;
+	esac        
+	for f in in.d/authkeys.in \
 		in.d/ha.cf.in in.d/haresources.in in.d/recovery.conf.in \
 		in.d/ultrapossum.mon.cf.in
 	do
@@ -60,15 +75,14 @@
 
     	echo -n "Configuring failover support... " 1>&2
 
-        ULTRAPOSSUMDEFAULT=1
-        eval `ultrapossum-config init`
-
+	setfailoverconfig backup BACKUP
 	setfailoverconfig nfsdir NFSDIR
 
 	db_stop
+        eval `ultrapossum-config term`
 
 	tmp=`tempfile`
-	trap "/bin/rm -f $tmp; eval `ultrapossum-config term`" 0
+	trap "/bin/rm -f $tmp" 0
 	if /usr/share/ultrapossum/update.d/update-failover configure 2> $tmp; then
 	  echo "done" 1>&2
 	else
===================================================================
RCS file: ultrapossum/debian/ultrapossum-failover.templates,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ultrapossum/debian/ultrapossum-failover.templates	2004/03/13 14:25:53	1.1.1.1
+++ ultrapossum/debian/ultrapossum-failover.templates	2004/09/16 18:30:12	1.2
@@ -1,3 +1,8 @@
 Template: ultrapossum-failover/nfsdir
 Type: string
 _Description: NFS directory
+
+Template: ultrapossum-failover/backup
+Type: select
+Choices: ${slaves}
+_Description: Which server become the backup server?
===================================================================
RCS file: ultrapossum/debian/ultrapossum-server.postinst,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ultrapossum/debian/ultrapossum-server.postinst	2004/09/16 13:46:44	1.26
+++ ultrapossum/debian/ultrapossum-server.postinst	2004/09/16 18:30:12	1.27
@@ -52,7 +52,26 @@
 case "$1" in
     configure)
 
-	for f in default.cf module.d/server.cf in.d/slapd-bdb.conf.in \
+	# removing previously generated settings
+	ultrapossum-config remove server MASTER DBDIRECTORY \
+		UPDATERDN RPLDIR ROOTRDN SLURPDSLAVES
+	ultrapossum-config remove secret ROOTPW CREDENTIALS
+
+	# initializing ultrapossum environment
+        eval `ultrapossum-config init`
+	trap "eval `ultrapossum-config term`" 0
+
+	case "$ULTRAPOSSUM_CONFIG_BACKEND" in
+	  ldap)
+	    :
+	  ;;
+	  *)
+	    install -d /etc/ultrapossum/module.d
+	    ucf /usr/share/ultrapossum/ucf/ultrapossum/module.d/server.cf \
+	  	/etc/ultrapossum/module.d/server.cf
+	  ;;
+	esac
+	for f in default.cf in.d/slapd-bdb.conf.in \
 		in.d/slapd-ldbm.conf.in in.d/init.ldif.in
 	do
 	  install -d `dirname /etc/ultrapossum/$f`
@@ -70,29 +89,12 @@
           fi
 	fi
 
-        if ! test -f /etc/ultrapossum/ultrapossum.cf; then
-          echo -n "Creating ultrapossum.cf... " 1>&2
-          touch /etc/ultrapossum/ultrapossum.cf
-          echo "done" 1>&2
-        fi
-
-	# removing previously generated settings
-	ultrapossum-config remove server MASTER DBDIRECTORY \
-		UPDATERDN RPLDIR ROOTRDN SLURPDSLAVES
-	ultrapossum-config remove secret ROOTPW CREDENTIALS
-
-	# initializing ultrapossum environment
-        eval `ultrapossum-config init`
-	trap "eval `ultrapossum-config term`" 0
-
 	setconfig organization ORGANIZATION
 	setconfig suffix SUFFIX
-#	setconfig backup BACKUP
 
 	setserverconfig master MASTER
 	setserverconfig directory DBDIRECTORY
 	setserverconfig updaterdn UPDATERDN
-#	setserverconfig rpldir RPLDIR
         setserverconfig rootrdn ROOTRDN
 	setserverconfig slaves SLURPDSLAVES
 
===================================================================
RCS file: ultrapossum/debian/ultrapossum-tls.config,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ultrapossum/debian/ultrapossum-tls.config	2004/05/14 04:55:50	1.4
+++ ultrapossum/debian/ultrapossum-tls.config	2004/09/16 18:30:12	1.5
@@ -12,7 +12,7 @@
 trap "/bin/rm -f $tmp" 0
 chmod 600 $tmp
 
-if test "$1" = "reconfigure"; then
+if test -x "/usr/bin/ultrapossum-config"; then
   eval `/usr/bin/ultrapossum-config init`
   trap "/bin/rm -f $tmp; eval `ultrapossum-config term`" 0
 else
@@ -31,6 +31,13 @@
   if test -f "/etc/ultrapossum/module.d/startTLS.cf"; then
     . /etc/ultrapossum/module.d/startTLS.cf
   fi
+fi
+
+if test "x$1" = "xreconfigure"; then
+  set() {
+    db_set "$1" "$2"
+  }
+else
   if test -f "$TLSCERTIFICATEFILE"; then
     echo "Certificate file already exist; $TLSCERTIFICATEFILE" 1>&2
     exit 0
@@ -39,27 +46,21 @@
     echo "Certificate key file already exist; $TLSCERTIFICATEKEYFILE" 1>&2
     exit 0
   fi
+  set() {
+    db_fget "$1" seen
+    if test "x$RET" = "xfalse"; then
+      db_set "$1" "$2"
+    fi
+  }
 fi
 
-setdefault() {
-  if test "x${!1}" != "x"; then
-    db_set "$2" "${!1}"
-  fi
-}
-
-setdefault CERTCOUNTRY ultrapossum-tls/certcountry
-setdefault CERTSTATE ultrapossum-tls/certstate
-setdefault CERTLOCALITY ultrapossum-tls/certlocality
-setdefault CERTORGANIZATION ultrapossum-tls/certorganization
-setdefault CERTUNIT ultrapossum-tls/certunit
-setdefault CERTHOST ultrapossum-tls/certhost
-setdefault CERTEMAIL ultrapossum-tls/certemail
-
-# if you don't have sanity checker (probably by dpkg-preconfigure)
-# don't allow to edit
-#if ! test -x "$UPDATEDIR/update-startTLS"; then
-#  exit 0
-#fi
+set ultrapossum-tls/certcountry "$CERTCOUNTRY"
+set ultrapossum-tls/certstate "$CERTSTATE"
+set ultrapossum-tls/certlocality "$CERTLOCALITY"
+set ultrapossum-tls/certorganization "$CERTORGANIZATION"
+set ultrapossum-tls/certunit "$CERTUNIT"
+set ultrapossum-tls/certhost "$CERTHOST"
+set ultrapossum-tls/certemail "$CERTEMAIL"
 
 # set to true in order to prevent infinite loop when noninteractive
 db_set ultrapossum-common/sanity true
===================================================================
RCS file: ultrapossum/debian/ultrapossum-tls.postinst,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ultrapossum/debian/ultrapossum-tls.postinst	2004/05/14 04:49:22	1.6
+++ ultrapossum/debian/ultrapossum-tls.postinst	2004/09/16 18:30:13	1.7
@@ -35,15 +35,23 @@
 
 case "$1" in
     configure)
-        install -d /etc/ultrapossum/module.d/
-    	ucf /usr/share/ultrapossum/ucf/ultrapossum/module.d/startTLS.cf \
-		/etc/ultrapossum/module.d/startTLS.cf
-
 	ultrapossum-config remove startTLS CERTCOUNTRY CERTSTATE \
 		CERTLOCALITY CERTORGANIZATION CERTHOST CERTUNIT CERTEMAIL
+
 	eval `ultrapossum-config init`
 	trap "eval `ultrapossum-config term`" 0
 
+        case "$ULTRAPOSSUM_CONFIG_BACKEND" in
+          ldap)
+            :
+          ;;
+          *)
+            install -d /etc/ultrapossum/module.d/
+      	    ucf /usr/share/ultrapossum/ucf/ultrapossum/module.d/startTLS.cf \
+		/etc/ultrapossum/module.d/startTLS.cf
+          ;;
+        esac
+
 	settlsconfig certcountry CERTCOUNTRY
 	settlsconfig certstate CERTSTATE
 	settlsconfig certlocality CERTLOCALITY
@@ -54,9 +62,11 @@
 
 	db_stop
 
+	eval `ultrapossum-config term`
+
     	echo -n "Configuring startTLS extension... " 1>&2
 	tmp=`tempfile`
-	trap "/bin/rm -f $tmp; eval `ultrapossum-config term`" 0
+	trap "/bin/rm -f $tmp" 0
 	if /usr/share/ultrapossum/update.d/update-startTLS configure 2> $tmp; then
 	  echo "done" 1>&2
 	else


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 03:30:13 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 03:30:13 +0900
Subject: [Ultrapossum-cvs 448] ultrapossum/module/server 1.9,1.10,10server
Message-ID: <20040916183013.4D91A2AC012@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/server/10server,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ultrapossum/module/server/10server	2004/09/15 10:31:05	1.9
+++ ultrapossum/module/server/10server	2004/09/16 18:30:13	1.10
@@ -220,7 +220,11 @@
   SLAVES="$SLURPDSLAVES $SLAVES"
 fi
 if test "x$SYNCBACKUPS" != "x"; then
-  SLAVES="$SYNCBACKUPS $SLAVES"
+  for s in $SYNCBACKUPS; do
+    if test "x$s" != "x$MASTER"; then
+      SLAVES="$s $SLAVES"
+    fi
+  done
 fi
 
 if test "x$SECRETCF" = "x"; then


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 03:32:49 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 03:32:49 +0900
Subject: [Ultrapossum-cvs 449] ultrapossum/debian 1.49,1.50,changelog
Message-ID: <20040916183249.053EC2AC012@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/changelog,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- ultrapossum/debian/changelog	2004/09/16 13:52:30	1.49
+++ ultrapossum/debian/changelog	2004/09/16 18:32:48	1.50
@@ -1,3 +1,9 @@
+ultrapossum (0.1beta8-0pre3) unstable; urgency=low
+
+  * Applied the latest upstream version.
+
+ -- Masato Taruishi <taru ¡÷ valinux.co.jp>  Fri, 17 Sep 2004 03:32:34 +0900
+
 ultrapossum (0.1beta8-0pre2) unstable; urgency=low
 
   * Applied the latest upstream version.


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 11:53:23 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 11:53:23 +0900
Subject: [Ultrapossum-cvs 450] ultrapossum/debian ...
Message-ID: <20040917025323.7F1722AC0DB@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/ultrapossum-failover.config,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ultrapossum/debian/ultrapossum-failover.config	2004/09/16 18:30:12	1.4
+++ ultrapossum/debian/ultrapossum-failover.config	2004/09/17 02:53:23	1.5
@@ -31,20 +31,33 @@
   }
 fi
 
-set ultrapossum-failover/backup $BACKUP
-set ultrapossum-failover/nfsdir $NFSDIR
+set ultrapossum-failover/backup "$BACKUP"
+set ultrapossum-failover/nfsdir "$NFSDIR"
+set ultrapossum-failover/virtual "$VIRTUAL"
 
-slaves=`echo $SLAVES | sed 's/ /, /g'`
-db_subst ultrapossum-failover/backup slaves "$slaves"
-db_input high ultrapossum-failover/backup || true
+db_input high ultrapossum-failover/do_failover || true
 db_go || true
+db_get ultrapossum-failover/do_failover
 
-db_get ultrapossum-failover/backup
-if include "$RET" "$SLURPDSLAVES"; then
-  db_input high ultrapossum-failover/nfsdir || true
+if test "x$RET" = "xtrue"; then
+  slaves=`echo $SLAVES | sed 's/ /, /g'`
+  db_subst ultrapossum-failover/backup slaves "$slaves"
+  db_input high ultrapossum-failover/backup || true
+  db_input high ultrapossum-failover/virtual || true
   db_go || true
+
+  db_get ultrapossum-failover/backup
+  if include "$RET" "$SLURPDSLAVES"; then
+    db_input high ultrapossum-failover/nfsdir || true
+    db_go || true
+  else
+    db_set ultrapossum-failover/nfsdir ""
+  fi
 else
-  db_set ultrapossum-failover/nfsdir ""
-  db_fset ultrapossum-failover/nfsdir seen true
+  db_set ultrapossum-failover/backup ""
 fi
+
+db_fset ultrapossum-failover/backup seen true
+db_fset ultrapossum-failover/virtual seen true
+db_fset ultrapossum-failover/nfsdir seen true
 
===================================================================
RCS file: ultrapossum/debian/ultrapossum-failover.postinst,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ultrapossum/debian/ultrapossum-failover.postinst	2004/09/16 18:30:12	1.8
+++ ultrapossum/debian/ultrapossum-failover.postinst	2004/09/17 02:53:23	1.9
@@ -37,7 +37,7 @@
 
 case "$1" in
     configure)
-        ultrapossum-config remove failover NFSDIR BACKUP
+        ultrapossum-config remove failover NFSDIR BACKUP VIRTUAL
 
         eval `ultrapossum-config init`
         trap "eval `ultrapossum-config term`" 0
@@ -77,6 +77,7 @@
 
 	setfailoverconfig backup BACKUP
 	setfailoverconfig nfsdir NFSDIR
+	setfailoverconfig virtual VIRTUAL
 
 	db_stop
         eval `ultrapossum-config term`
===================================================================
RCS file: ultrapossum/debian/ultrapossum-failover.templates,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ultrapossum/debian/ultrapossum-failover.templates	2004/09/16 18:30:12	1.2
+++ ultrapossum/debian/ultrapossum-failover.templates	2004/09/17 02:53:23	1.3
@@ -1,8 +1,17 @@
-Template: ultrapossum-failover/nfsdir
-Type: string
-_Description: NFS directory
+Template: ultrapossum-failover/do_failover
+Type: boolean
+Default: false
+_Description: Do you want to fail over the master service?
 
 Template: ultrapossum-failover/backup
 Type: select
 Choices: ${slaves}
 _Description: Which server become the backup server?
+
+Template: ultrapossum-failover/virtual
+Type: string
+_Description: What is the virtual IP address of the master service?
+
+Template: ultrapossum-failover/nfsdir
+Type: string
+_Description: NFS directory


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 11:53:23 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 11:53:23 +0900
Subject: [Ultrapossum-cvs 451] ultrapossum/module/failover 1.11, 1.12,
	update-failover
Message-ID: <20040917025323.B04A72AC0E8@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/failover/update-failover,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ultrapossum/module/failover/update-failover	2004/09/16 18:30:13	1.11
+++ ultrapossum/module/failover/update-failover	2004/09/17 02:53:23	1.12
@@ -152,6 +152,10 @@
       progress "Installing New version of authkeys... done"
     fi
   fi
+  if test "x$BACKUP" != "x" && include "$LDAPMASTER" "$MASTER $SLAVES"; then
+    echo "E: LDAPMASTER '$LDAPMASTER' must be a virtual name." 1>&2
+    sanity_error=1
+  fi
   if test "x$BACKUP" != "x" && ! include "$BACKUP" "$SYNCBACKUPS"; then
   # If we use a backup server, need to set NFSDIR or nice_failback on
     if test "x$NFSDIR" = "x"; then


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 11:56:22 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 11:56:22 +0900
Subject: [Ultrapossum-cvs 452] ultrapossum/module/failover 1.3,1.4,11failover
Message-ID: <20040917025622.1FCF42AC0DB@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/failover/11failover,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ultrapossum/module/failover/11failover	2004/09/16 18:30:13	1.3
+++ ultrapossum/module/failover/11failover	2004/09/17 02:56:22	1.4
@@ -62,7 +62,7 @@
 
 if test "x$cache" = "x"; then
 
-if test "x$VIRTUAL" != "x"; then
+if test "x$VIRTUAL" != "x" && test "x$BACKUP" != "x"; then
   LDAPMASTER="$VIRTUAL"
 fi
 


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 12:05:00 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 12:05:00 +0900
Subject: [Ultrapossum-cvs 453] ultrapossum/debian 1.9, 1.10,
	ultrapossum-failover.postinst
Message-ID: <20040917030500.55E3C2AC0DB@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/ultrapossum-failover.postinst,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ultrapossum/debian/ultrapossum-failover.postinst	2004/09/17 02:53:23	1.9
+++ ultrapossum/debian/ultrapossum-failover.postinst	2004/09/17 03:05:00	1.10
@@ -29,7 +29,7 @@
 setfailoverconfig() {
   db_get ultrapossum-failover/$1
   if test "x$RET" != "x${!2}"; then
-    ultrapossum-config set failover "$2=\"$RET\""
+    ultrapossum-config set failover $2="$RET"
   else
     ultrapossum-config remove failover $2
   fi


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 12:45:24 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 12:45:24 +0900
Subject: [Ultrapossum-cvs 454] ultrapossum 1.16,1.17,ultrapossum-config.in
Message-ID: <20040917034524.5979B2AC0DB@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/ultrapossum-config.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ultrapossum/ultrapossum-config.in	2004/09/16 07:40:28	1.16
+++ ultrapossum/ultrapossum-config.in	2004/09/17 03:45:24	1.17
@@ -20,6 +20,7 @@
 prefix=${prefix:- ¡÷ prefix@}
 SHAREDIR=${prefix}/share/ultrapossum
 MODULEDIR=${MODULEDIR:-$SHAREDIR/module.d}
+SYSCONFDIR=${SYSCONFDIR:- ¡÷ sysconfdir@/@PACKAGE@}
 localstatedir=${localstatedir:- ¡÷ localstatedir@}
 PACKAGE=${PACKAGE:- ¡÷ PACKAGE@}
 


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 15:02:03 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 15:02:03 +0900
Subject: [Ultrapossum-cvs 455] ultrapossum/module/server 1.7,1.8,sshman
Message-ID: <20040917060203.1A51B2AC010@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/server/sshman,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ultrapossum/module/server/sshman	2004/09/07 10:30:45	1.7
+++ ultrapossum/module/server/sshman	2004/09/17 06:02:02	1.8
@@ -6,6 +6,8 @@
 tmp=`tempfile`
 trap "/bin/rm -f $tmp; eval `ultrapossum-config term`" 0
 
+home=$(getent passwd | egrep "^`whoami`:" | cut -d: -f6)
+
 #keygen <cmd>
 keygen() {
   if ! test -f "$SSHKEYDIR/$1/id_rsa"; then
@@ -26,13 +28,13 @@
   done
   echo "." 1>&2
   add_endmark "##" "SERVER" >> $tmp
-  install -m700 -d $HOME/.ssh/
-  add_end_vaconf $HOME/.ssh/authorized_keys $tmp "SERVER"
+  install -m700 -d $home/.ssh/
+  add_end_vaconf $home/.ssh/authorized_keys $tmp "SERVER"
 }
 
 unauth() {
-  if test -f $HOME/.ssh/authorized_keys; then
-    strip_vaconf $HOME/.ssh/authorized_keys "SERVER"
+  if test -f $home/.ssh/authorized_keys; then
+    strip_vaconf $home/.ssh/authorized_keys "SERVER"
   fi
 }
 


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 15:24:32 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 15:24:32 +0900
Subject: [Ultrapossum-cvs 456] ultrapossum/debian 1.17,1.18,control
Message-ID: <20040917062432.CA2FF2AC00E@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/control,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ultrapossum/debian/control	2004/09/07 12:17:13	1.17
+++ ultrapossum/debian/control	2004/09/17 06:24:32	1.18
@@ -33,7 +33,7 @@
 
 Package: ultrapossum-server
 Architecture: all
-Depends: ultrapossum-slapd | slapd, ultrapossum-common (>= ${Source-Version}), ssh, binutils, ldap-utils, makepasswd, ucf, ${misc:Depends}, ${perl:Depends}
+Depends: ultrapossum-slapd | slapd, ultrapossum-common (>= ${Source-Version}), ssh, binutils, ldap-utils, makepasswd, ucf, libc6, ${misc:Depends}, ${perl:Depends}
 Suggests: ultrapossum-failover, dlocate
 Description: ULtraPossum LDAP server
  This package consists of the UltraPossum LDAP Server core scripts.


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 15:35:05 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 15:35:05 +0900
Subject: [Ultrapossum-cvs 457] demo/haviewer/lib/haviewer 1.9, 1.10,
	ultrapossum.rb
Message-ID: <20040917063505.4F7792AC00E@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/lib/haviewer/ultrapossum.rb,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- demo/haviewer/lib/haviewer/ultrapossum.rb	2004/09/16 06:04:43	1.9
+++ demo/haviewer/lib/haviewer/ultrapossum.rb	2004/09/17 06:35:05	1.10
@@ -4,15 +4,14 @@
 
   class UltraPossumHost < Host
 
-    OID = "private.12345"  # .2.101.1"
-    OID_STATUS = OID + ".1.1.0"
-    OID_PID = OID + ".1.2.0"
-    OID_SINCE = OID + ".1.3.0"
-    
     @@conf = ::UltraPossum::Config.new
     @@latest_entryCSN = ""
     @@monitored_entry = "cn=u0001,#{@@conf["SUFFIX"]}"
 
+    STATUS = ".1.1.0"
+    PID = ".1.2.0"
+    SINCE = ".1.3.0"
+
     def UltraPossumHost.update_latest_entryCSN
       `ldapsearch -l 1 -x -h #{UltraPossumHost.conf["LDAPMASTER"]} -b #{@@monitored_entry} -s base -LLL +`.each_line do |line|
         case line
@@ -78,20 +77,25 @@
     end
 
     def snmp
+      status = @@conf["SNMP_MIB"] + STATUS
       statusbuf = nil
+      pid = @@conf["SNMP_MIB"] + PID
       pidbuf = nil
+      since = @@conf["SNMP_MIB"] + SINCE
       sincebuf = nil
-      puts "snmpget -v1 -t 3 -c ultrapossum #{@host} #{OID_STATUS} #{OID_PID} #{OID_SINCE}" if $DEBUG
-      buf = `snmpget -v1 -t 3 -c ultrapossum #{@host} #{OID_STATUS} #{OID_PID} #{OID_SINCE}`
+
+      snmpget = "snmpget -On -v1 -t 3 -c ultrapossum #{@host} #{status} #{pid} #{since}"
+      puts snmpget if $DEBUG
+      buf = `#{snmpget}`
       buf.each_line do |line|
         case line
-        when /#{OID_STATUS}/
+        when /#{status}/
             statusbuf = line.gsub(/^[^"]+"(.*)"\n/, '\1')
           statusbuf = "-----" if statusbuf.size == 0
-        when /#{OID_PID}/
+        when /#{pid}/
             pidbuf = line.gsub(/^[^"]+"(.*)"\n/, '\1')
           pidbuf = "-----" if pidbuf.size == 0
-        when /#{OID_SINCE}/
+        when /#{since}/
             sincebuf = line.gsub(/^[^"]+"(.*)"\n/, '\1')
           sincebuf = "-----" if sincebuf.size == 0
         end


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 15:45:35 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 15:45:35 +0900
Subject: [Ultrapossum-cvs 458] web ...
Message-ID: <20040917064535.C6D3F2AC010@users.sourceforge.jp>

===================================================================
RCS file: web/demo.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- web/demo.html	2004/05/28 07:39:38	1.15
+++ web/demo.html	2004/09/17 06:45:35	1.16
@@ -21,7 +21,7 @@
 </tbody>
 </table>
 
-    [<a href=".">¥È¥Ã¥×</a>][<a href="faq.html">FAQ</a>][¹½À®Îã][<a href="quickguide.html">¥¯¥¤¥Ã¥¯¥¬¥¤¥É</a>]
+    [<a href=".">¥È¥Ã¥×</a>][<a href="faq.html">FAQ</a>][<a href="screenshots.html">¥¹¥¯¥ê¡¼¥ó¥·¥ç¥Ã¥È</a>][¹½À®Îã][<a href="quickguide.html">¥¯¥¤¥Ã¥¯¥¬¥¤¥É</a>]
 
     <h1>¹½À®Îã</h1>
 
===================================================================
RCS file: web/faq.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- web/faq.html	2004/04/30 09:40:24	1.15
+++ web/faq.html	2004/09/17 06:45:35	1.16
@@ -21,7 +21,7 @@
 </tbody>
 </table>
 
-    [<a href=".">¥È¥Ã¥×</a>][FAQ][<a href="demo.html">¹½À®Îã</a>][<a href="quickguide.html">¥¯¥¤¥Ã¥¯¥¬¥¤¥É</a>]
+    [<a href=".">¥È¥Ã¥×</a>][FAQ][<a href="screenshots.html">¥¹¥¯¥ê¡¼¥ó¥·¥ç¥Ã¥È</a>][<a href="demo.html">¹½À®Îã</a>][<a href="quickguide.html">¥¯¥¤¥Ã¥¯¥¬¥¤¥É</a>]
 
     <h1>¤è¤¯¤¢¤ë¼ÁÌä</h1>
     <dl>
===================================================================
RCS file: web/index.ja.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- web/index.ja.html	2004/07/03 05:00:45	1.10
+++ web/index.ja.html	2004/09/17 06:45:35	1.11
@@ -25,7 +25,7 @@
 </tbody>
 </table>
 
-    [¥È¥Ã¥×][<a href="faq.html">FAQ</a>][<a href="demo.html">¹½À®Îã</a>][<a href="quickguide.html">¥¯¥¤¥Ã¥¯¥¬¥¤¥É</a>][<a href="index.en.html">±Ñ¸ì</a>]
+    [¥È¥Ã¥×][<a href="faq.html">FAQ</a>][<a href="screenshots.html">¥¹¥¯¥ê¡¼¥ó¥·¥ç¥Ã¥È</a>][<a href="demo.html">¹½À®Îã</a>][<a href="quickguide.html">¥¯¥¤¥Ã¥¯¥¬¥¤¥É</a>][<a href="index.en.html">±Ñ¸ì</a>]
 
 <p>
 UltraPossum ¤Ï¡¢Linux ¤Ê¤É¤Î Unix ¥é¥¤¥¯¤Ê¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¾å¤Ç¡¢¥ª¡¼¥×¥ó¥½¡¼¥¹¥³¥ó¥Ý¡¼¥Í¥ó¥È¤ò»ÈÍѤ·¤Æ¥Ç¥£¥ì¥¯¥È¥ê¥µ¡¼¥Ó¥¹¤ò¼Â¸½¤¹¤ë¤¿¤á¤Î¥½¥ê¥å¡¼¥·¥ç¥ó¤Ç¤¹¡£
===================================================================
RCS file: web/quickguide.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- web/quickguide.html	2004/05/13 16:38:20	1.33
+++ web/quickguide.html	2004/09/17 06:45:35	1.34
@@ -27,7 +27,7 @@
 </tbody>
 </table>
 
-    [<a href="/">¥È¥Ã¥×</a>][<a href="faq.html">FAQ</a>][<a href="demo.html">¹½À®Îã</a>][¥¯¥¤¥Ã¥¯¥¬¥¤¥É]
+    [<a href="/">¥È¥Ã¥×</a>][<a href="faq.html">FAQ</a>][<a href="screenshots.html">¥¹¥¯¥ê¡¼¥ó¥·¥ç¥Ã¥È</a>][<a href="demo.html">¹½À®Îã</a>][¥¯¥¤¥Ã¥¯¥¬¥¤¥É]
 
 <h1>UltraPossum ¥¯¥¤¥Ã¥¯¥¬¥¤¥É for Debian</h1>
 


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 15:45:35 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 15:45:35 +0900
Subject: [Ultrapossum-cvs 459] web/pics ...
Message-ID: <20040917064535.DC3D12AC011@users.sourceforge.jp>



From taru ¡÷ users.sourceforge.jp  Fri Sep 17 15:49:15 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 15:49:15 +0900
Subject: [Ultrapossum-cvs 460] web 1.1,1.2,screenshots.html
Message-ID: <20040917064915.6E1262AC010@users.sourceforge.jp>

===================================================================
RCS file: web/screenshots.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- web/screenshots.html	2004/09/17 06:45:35	1.1
+++ web/screenshots.html	2004/09/17 06:49:15	1.2
@@ -29,20 +29,20 @@
       °Ê²¼¤Ï UltraPossum  ¤ËÂбþ¤·¤¿¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥¹¥¯¥ê¡¼¥ó¥·¥ç¥Ã¥È¤Ç¤¹¡£
     </p>
 
-    <h3>UltraPossum HA Viewer</h3>
+    <h2>UltraPossum HA Viewer</h2>
     <p>
       UltraPossum HA Viewer ¤Ï UltraPossum ÀìÍѤΥӥ塼¥¢¤Ç¤¹¡£
     </p>
-    <h4>²ÔƯ¾õ¶·´Æ»ë</h4>
+    <h3>²ÔƯ¾õ¶·´Æ»ë</h3>
     <p>UltraPossum ¥¯¥é¥¹¥¿¤Î³Æ¥µ¡¼¥Ð¤Î¾õÂÖ¤ò SNMP ¤òÍѤ¤¤Æ¼èÆÀ¤·¡¢¿®¹æµ¡¤ò»È¤Ã¤Æ»ë³ÐŪ¤Ëɽ¼¨¤·¤Þ¤¹¡£
     </p>
     <img src="pics/haviewer-status.png">
 
-    <h4>¥ì¥×¥ê¥±¡¼¥·¥ç¥ó¥Æ¥¹¥È</h4>
+    <h3>¥ì¥×¥ê¥±¡¼¥·¥ç¥ó¥Æ¥¹¥È</h3>
     <p>UltraPossum ¤Î¹¹¿·¥µ¡¼¥Ð¤Î¥¨¥ó¥È¥ê¤ò¹¹¿·¤·¡¢¤½¤ÎÊѹ¹¤¬³Æ UltraPossum ¥µ¡¼¥Ð¤Ë¥ì¥×¥ê¥±¡¼¥·¥ç¥ó¤µ¤ì¤¿¤«¤É¤¦¤«¤ò¸¡¾Ú¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
     <img src="pics/haviewer-replication.png">
 
-    <h4>¥ì¥¸¥¹¥È¥ê¥Ó¥å¡¼¥¢</h4>
+    <h3>¥ì¥¸¥¹¥È¥ê¥Ó¥å¡¼¥¢</h3>
     <p>UltraPossum ¼«ÂΤΥ쥸¥¹¥È¥ê¾ðÊó¤ò±ÜÍ÷¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
     <img src="pics/haviewer-registry.png">
 


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 16:04:43 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 16:04:43 +0900
Subject: [Ultrapossum-cvs 461] web 1.2,1.3,screenshots.html
Message-ID: <20040917070443.758A42AC011@users.sourceforge.jp>

===================================================================
RCS file: web/screenshots.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- web/screenshots.html	2004/09/17 06:49:15	1.2
+++ web/screenshots.html	2004/09/17 07:04:43	1.3
@@ -43,7 +43,7 @@
     <img src="pics/haviewer-replication.png">
 
     <h3>¥ì¥¸¥¹¥È¥ê¥Ó¥å¡¼¥¢</h3>
-    <p>UltraPossum ¼«ÂΤΥ쥸¥¹¥È¥ê¾ðÊó¤ò±ÜÍ÷¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
+    <p>UltraPossum ¤Î¥ì¥¸¥¹¥È¥ê¾ðÊó¤ò±ÜÍ÷¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
     <img src="pics/haviewer-registry.png">
 
 <br clear=right>


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 16:09:16 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 16:09:16 +0900
Subject: [Ultrapossum-cvs 462] ultrapossum 1.41,1.42,configure.in
Message-ID: <20040917070916.93CDC2AC010@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/configure.in,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ultrapossum/configure.in	2004/09/16 18:30:12	1.41
+++ ultrapossum/configure.in	2004/09/17 07:09:16	1.42
@@ -4,8 +4,8 @@
 # $Id$
 
 AC_PREREQ(2.50)
-AC_INIT(ultrapossum, 0.1beta8, taru ¡÷ ultrapossum.org)
-AM_INIT_AUTOMAKE(ultrapossum, 0.1beta8)
+AC_INIT(ultrapossum, 0.1beta9, taru ¡÷ ultrapossum.org)
+AM_INIT_AUTOMAKE(ultrapossum, 0.1beta9)
 
 # Checks for programs.
 AC_PROG_INSTALL


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 16:10:04 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 16:10:04 +0900
Subject: [Ultrapossum-cvs 463] ultrapossum/module/server 1.8,1.9,sshman
Message-ID: <20040917071004.B5D112AC010@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/server/sshman,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ultrapossum/module/server/sshman	2004/09/17 06:02:02	1.8
+++ ultrapossum/module/server/sshman	2004/09/17 07:10:04	1.9
@@ -7,6 +7,9 @@
 trap "/bin/rm -f $tmp; eval `ultrapossum-config term`" 0
 
 home=$(getent passwd | egrep "^`whoami`:" | cut -d: -f6)
+if test "x$home" = "x"; then
+  home=$HOME
+fi
 
 #keygen <cmd>
 keygen() {


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 16:10:31 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 16:10:31 +0900
Subject: [Ultrapossum-cvs 464] ultrapossum/init.d 1.2,1.3,30logical
Message-ID: <20040917071031.35D802AC010@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/init.d/30logical,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ultrapossum/init.d/30logical	2004/09/16 13:46:44	1.2
+++ ultrapossum/init.d/30logical	2004/09/17 07:10:31	1.3
@@ -1,12 +1,4 @@
 # Building Logical Variables
-TYPE=client
-if test "x$MASTER" = "x$HOST" || test "x$BACKUP" = "x$HOST" || include "$HOST" "$SYNCBACKUPS"; then
-  TYPE=master
-else
-  for s in $SLAVES
-  do
-    if test "x$s" = "x$HOST"; then
-      TYPE=slave
-    fi
-  done
+if test "x$TYPE" = "x"; then
+  TYPE=client
 fi


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 16:10:31 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 16:10:31 +0900
Subject: [Ultrapossum-cvs 465] ultrapossum/module/server 1.10,1.11,10server
Message-ID: <20040917071031.4EB6C2AC011@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/server/10server,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ultrapossum/module/server/10server	2004/09/16 18:30:13	1.10
+++ ultrapossum/module/server/10server	2004/09/17 07:10:31	1.11
@@ -247,6 +247,17 @@
   SLAPROOTPW="XXXXXXXX"
 fi
 
+if test "x$MASTER" = "x$HOST" || test "x$BACKUP" = "x$HOST" || include "$HOST" "$SYNCBACKUPS"; then
+  TYPE=master
+else
+  for s in $SLAVES
+  do
+    if test "x$s" = "x$HOST"; then
+      TYPE=slave
+    fi
+  done
+fi
+
 fi
 
 ACLAPPDNREGEX=".*,$APPLICATION"


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 16:30:45 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 16:30:45 +0900
Subject: [Ultrapossum-cvs 466] ultrapossum/init.d 1.1,1.2,Makefile.am
Message-ID: <20040917073045.96C6B2AC010@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/init.d/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ultrapossum/init.d/Makefile.am	2004/09/15 12:17:50	1.1
+++ ultrapossum/init.d/Makefile.am	2004/09/17 07:30:45	1.2
@@ -6,3 +6,5 @@
 variable: $(init_DATA) Makefile
 	egrep -h "[A-Z_][A-Z_]*=" $(init_DATA) | cut -d= -f1 | grep -v IFS | tr -d '# ' | sort | uniq > $@
 
+EXTRA_DIST = $(init_DATA)
+


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 17:09:45 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 17:09:45 +0900
Subject: [Ultrapossum-cvs 467] ultrapossum/debian 1.50,1.51,changelog
Message-ID: <20040917080945.0F3ED2AC010@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/changelog,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- ultrapossum/debian/changelog	2004/09/16 18:32:48	1.50
+++ ultrapossum/debian/changelog	2004/09/17 08:09:45	1.51
@@ -1,3 +1,9 @@
+ultrapossum (0.1beta9-0pre1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Masato Taruishi <taru ¡÷ valinux.co.jp>  Fri, 17 Sep 2004 17:07:50 +0900
+
 ultrapossum (0.1beta8-0pre3) unstable; urgency=low
 
   * Applied the latest upstream version.


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 17:39:07 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 17:39:07 +0900
Subject: [Ultrapossum-cvs 468] web 1.3,1.4,screenshots.html
Message-ID: <20040917083907.68A0E2AC012@users.sourceforge.jp>

===================================================================
RCS file: web/screenshots.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- web/screenshots.html	2004/09/17 07:04:43	1.3
+++ web/screenshots.html	2004/09/17 08:39:07	1.4
@@ -36,15 +36,15 @@
     <h3>²ÔƯ¾õ¶·´Æ»ë</h3>
     <p>UltraPossum ¥¯¥é¥¹¥¿¤Î³Æ¥µ¡¼¥Ð¤Î¾õÂÖ¤ò SNMP ¤òÍѤ¤¤Æ¼èÆÀ¤·¡¢¿®¹æµ¡¤ò»È¤Ã¤Æ»ë³ÐŪ¤Ëɽ¼¨¤·¤Þ¤¹¡£
     </p>
-    <img src="pics/haviewer-status.png">
+    <center><img src="pics/haviewer-status.png"></center>
 
     <h3>¥ì¥×¥ê¥±¡¼¥·¥ç¥ó¥Æ¥¹¥È</h3>
     <p>UltraPossum ¤Î¹¹¿·¥µ¡¼¥Ð¤Î¥¨¥ó¥È¥ê¤ò¹¹¿·¤·¡¢¤½¤ÎÊѹ¹¤¬³Æ UltraPossum ¥µ¡¼¥Ð¤Ë¥ì¥×¥ê¥±¡¼¥·¥ç¥ó¤µ¤ì¤¿¤«¤É¤¦¤«¤ò¸¡¾Ú¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-    <img src="pics/haviewer-replication.png">
+    <center><img src="pics/haviewer-replication.png"></center>
 
     <h3>¥ì¥¸¥¹¥È¥ê¥Ó¥å¡¼¥¢</h3>
     <p>UltraPossum ¤Î¥ì¥¸¥¹¥È¥ê¾ðÊó¤ò±ÜÍ÷¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-    <img src="pics/haviewer-registry.png">
+    <center><img src="pics/haviewer-registry.png"></center>
 
 <br clear=right>
 <br clear=left>


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 19:55:57 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 19:55:57 +0900
Subject: [Ultrapossum-cvs 469] ultrapossum 1.17,1.18,ultrapossum-config.in
Message-ID: <20040917105557.B2D512AC012@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/ultrapossum-config.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ultrapossum/ultrapossum-config.in	2004/09/17 03:45:24	1.17
+++ ultrapossum/ultrapossum-config.in	2004/09/17 10:55:57	1.18
@@ -17,6 +17,10 @@
 
 set -e
 
+if test "x$ULTRAPOSSUM_DEBUG" != "x"; then
+  set -x
+fi
+
 prefix=${prefix:- ¡÷ prefix@}
 SHAREDIR=${prefix}/share/ultrapossum
 MODULEDIR=${MODULEDIR:-$SHAREDIR/module.d}


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 19:55:57 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 19:55:57 +0900
Subject: [Ultrapossum-cvs 470] ultrapossum/test 1.7,1.8,run.in
Message-ID: <20040917105557.EA5F92AC04D@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/test/run.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ultrapossum/test/run.in	2004/04/02 02:34:28	1.7
+++ ultrapossum/test/run.in	2004/09/17 10:55:57	1.8
@@ -26,10 +26,11 @@
 fi
 if echo "@sysconfdir@" | egrep -v "^$root" > /dev/null; then
   sysconfdir=$root/@sysconfdir@
+  SYSCONFDIR=$sysconfdir/@PACKAGE@
 fi
 PATH=$prefix/bin:$prefix/sbin:$PATH
 
-export prefix localstatedir sysconfdir PATH
+export prefix localstatedir sysconfdir PATH SYSCONFDIR
 
 exec "$@"
 


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 19:55:57 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 19:55:57 +0900
Subject: [Ultrapossum-cvs 471] ultrapossum/init.d 1.3, 1.4, 10config 1.2, 1.3,
	15variable
Message-ID: <20040917105557.D9F652AC048@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/init.d/10config,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ultrapossum/init.d/10config	2004/09/16 07:40:28	1.3
+++ ultrapossum/init.d/10config	2004/09/17 10:55:57	1.4
@@ -102,25 +102,29 @@
     ldap)
     ;;
     *)
-      if test -f "$MODULECONFDIR/$1.cf"; then
-        fs="$MODULECONFDIR/$1.cf"
-      fi
-      if test "x$EXTRACONFSUFFIX" != "x" && test -f "$MODULECONFDIR/$1.cf$EXTRACONFSUFFIX"; then
-        fs="$fs $MODULECONFDIR/$1.cf$EXTRACONFSUFFIX"
-      fi
-
-      for f in $fs; do
-        if test -r "$f"; then
-          cat $f
-	else
-          echo "Warning: no permission to read $f" 1>&2
-        fi
-      done
-
-   ;;
+      ultrapossum_parse_config_shell "$MODULECONFDIR/$1.cf"
+    ;;
   esac
 
 }
+
+# ultrapossum_parse_config_shell <path>
+ultrapossum_parse_config_shell() {
+  if test -f "$1"; then
+    fs="$1"
+  fi
+  if test "x$EXTRACONFSUFFIX" != "x" && test -f "$1$EXTRACONFSUFFIX"; then
+    fs="$fs $1$EXTRACONFSUFFIX"
+  fi
+  for f in $fs; do
+    if test -r "$f"; then
+      cat $f
+    else
+      echo "Warning: no permission to read $f" 1>&2
+    fi
+  done
+}
+
 
 # retrieve the known variables
 # getvariable [<module>...]
===================================================================
RCS file: ultrapossum/init.d/15variable,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ultrapossum/init.d/15variable	2004/09/16 13:46:44	1.2
+++ ultrapossum/init.d/15variable	2004/09/17 10:55:57	1.3
@@ -19,63 +19,22 @@
   . $CACHEDIR/$cache
 fi ## cache
 
-if test "x$ULTRAPOSSUMDEFAULT" = "x"; then
-  if test -f "$ULTRAPOSSUMCF"; then
-    . $ULTRAPOSSUMCF
-  fi
-  if test "x$EXTRACONFSUFFIX" != "x" &&
-  	test -f "$ULTRAPOSSUMCF$EXTRACONFSUFFIX"
-  then
-    . $ULTRAPOSSUMCF$EXTRACONFSUFFIX
-  fi
+# move to config backend framework?
+case "$ULTRAPOSSUM_CONFIG_BACKEND" in
+  ldap)
+   :
+  ;;
+  *)
+    eval "`ultrapossum_parse_config_shell "$ULTRAPOSSUMCF"`"
+    eval "`ultrapossum_parse_config_shell "$SYSCONFDIR/secret.cf"`"
+  ;;
+esac
 
-  if test -r "$SYSCONFDIR/secret.cf"; then
-    . $SYSCONFDIR/secret.cf
-  fi
-  if test "x$EXTRACONFSUFFIX" != "x" &&
-    test -r "$SYSCONFDIR/secret.cf$EXTRACONFSUFFIX"
-  then
-    . $SYSCONFDIR/secret.cf$EXTRACONFSUFFIX
-  fi
-
-  if test -d $APPSCONFDIR; then
-    for f in `find $APPSCONFDIR -name '*.cf'`
-    do
-      if test -f $f; then
-        cfs="$cfs $f"
-      fi
-    done
-    for f in `find $APPSCONFDIR -name "*.cf$EXTRACONFSUFFIX"`
-    do
-      if test -f $f; then
-        cfs="$cfs $f"
-      fi
-    done
-  fi
-
-  if test -f "$SYSCONFDIR/projects/$ULTRAPOSSUM_PROJECT"; then
-    . $SYSCONFDIR/projects/$ULTRAPOSSUM_PROJECT
-  fi
-  if test "x$EXTRACONFSUFFIX" != "x" &&
-    test -f "$SYSCONFDIR/projects/$ULTRAPOSSUM_PROJECT$EXTRACONFSUFFIX"
-  then
-    . $SYSCONFDIR/projects/$ULTRAPOSSUM_PROJECT$EXTRACONFSUFFIX
-  fi
-
-  if test "x$cfs" != "x"; then
-    for cf in $cfs
-    do
-      if test -f "$cf"; then
-        if test -r "$cf"; then
-          verbose -n "Using $cf... "
-          . $cf
-          verbose "done"
-        else
-          echo "Warning: no permission to read $cf" 1>&2
-        fi
-      else
-        echo "W: $cf not found" 1>&2
-      fi
-    done
-  fi
+if test -d $APPSCONFDIR; then
+  for f in `find $APPSCONFDIR -name '*.cf'`
+  do
+    eval "`ultrapossum_parse_config_shell "$f"`"
+  done
 fi
+
+eval "`ultrapossum_parse_config_shell "$SYSCONFDIR/projects/$ULTRAPOSSUM_PROJECT"`"


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 20:26:24 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 20:26:24 +0900
Subject: [Ultrapossum-cvs 472] ultrapossum 1.18,1.19,ultrapossum-config.in
Message-ID: <20040917112624.E73E62AC012@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/ultrapossum-config.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ultrapossum/ultrapossum-config.in	2004/09/17 10:55:57	1.18
+++ ultrapossum/ultrapossum-config.in	2004/09/17 11:26:24	1.19
@@ -40,28 +40,6 @@
         . $SHAREDIR/init.d/10config
         shift
         getvariable "$@"
-#        shift
-#        if test "x$1" = "x"; then
-#          modules=`ultrapossum-config module`
-#	else
-#	  modules="$@"
-#	fi
-#	for m in $modules 
-#	do
-#	  if test -f "$MODULEDIR/$m/variable-$m"; then
-#	    cat "$MODULEDIR/$m/variable-$m"
-#	  else
-#	    if test -d "$MODULEDIR/$m/"; then
-#	      /bin/ls $MODULEDIR/[0-9][0-9]$m | while read f; do
-#	        egrep "[A-Z_][A-Z_]*=" $f | cut -d= -f1 | grep -v IFS | tr -d ' ' | sort | uniq
-#              done
-#	    else
-#	       echo "E: No such module: $m" 1>&2
-#	       exit 1
-#	    fi
-#	  fi
-#	done
-#        if test "x$1" = "x"; then cat $SHAREDIR/variable; fi
         ;;
     xget)
         shift
@@ -75,28 +53,13 @@
           echo "Usage: $0 remove <category> <var>..."
           exit 1
         fi
-        eval `ultrapossum-config init`
-        trap "eval `ultrapossum-config term`" 0
-        if test "x$1" = "x."; then
-          config=$SYSCONFDIR/ultrapossum.cf
-        elif test "x$1" = "xsecret"; then
-          config=$SYSCONFDIR/secret.cf
-	elif test "x$1" = "x.status"; then
-	  config=$localstatedir/lib/$PACKAGE/status
-        else
-          config=$SYSCONFDIR/module.d/$1.cf
-        fi
-	if test -f "$config"; then
-          tmp=`tempfile`
-	  /bin/cp -p $config $tmp
-	  shift
-	  for v in "$@"
-	  do
-            egrep -v "^$v=" $config > $tmp || true
-            /bin/cp -p $tmp $config
-	  done
-	  /bin/rm -f $tmp
-	fi
+        cat=$1
+        shift
+        . $SHAREDIR/init.d/10config
+        for v in "$@"
+        do
+          ultrapossum_removeconf "$cat" "$v"
+        done
         ;;
 
     xset)


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 20:26:25 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 20:26:25 +0900
Subject: [Ultrapossum-cvs 473] ultrapossum/debian 1.51,1.52,changelog
Message-ID: <20040917112625.054762AC054@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/changelog,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- ultrapossum/debian/changelog	2004/09/17 08:09:45	1.51
+++ ultrapossum/debian/changelog	2004/09/17 11:26:24	1.52
@@ -1,3 +1,10 @@
+ultrapossum (0.1beta9-0pre2) unstable; urgency=low
+
+  * Applied the latest upstream version.
+     - Fix LDAP backend configuration handling
+
+ -- Masato Taruishi <taru ¡÷ valinux.co.jp>  Fri, 17 Sep 2004 20:23:23 +0900
+
 ultrapossum (0.1beta9-0pre1) unstable; urgency=low
 
   * New upstream release.


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 20:26:25 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 20:26:25 +0900
Subject: [Ultrapossum-cvs 474] ultrapossum/init.d 1.4,1.5,10config
Message-ID: <20040917112625.1CC632AC058@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/init.d/10config,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ultrapossum/init.d/10config	2004/09/17 10:55:57	1.4
+++ ultrapossum/init.d/10config	2004/09/17 11:26:25	1.5
@@ -40,23 +40,12 @@
   else
     case "$ULTRAPOSSUM_CONFIG_BACKEND" in
       ldap)
-v="dn: cn=$2,$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BASEDN
-objectClass: device
-cn: $2
-description: $3
-"
-        if echo "$v" | ldapadd -x -H "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_URI" -D "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDDN" -w "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDPW" > /dev/null 2>&1; then 
-          :
-        else
-          if test "$?" = "68"; then
         ldapmodify -x -H "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_URI" -D "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDDN" -w "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDPW" > /dev/null <<EOF
 dn: cn=$2,$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BASEDN
 changetype: modify
 replace: description
 description: $3
 EOF
-          fi 
-         fi
        ;;
       *)
         if test "x$1" = "x."; then
@@ -89,6 +78,42 @@
   fi
   /bin/mv $tmpsetconf $config
 
+}
+
+# ultrapossum_removeconf <category> <var>
+ultrapossum_removeconf() {
+  case "$ULTRAPOSSUM_CONFIG_BACKEND" in
+    ldap)
+        ldapmodify -x -H "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_URI" -D "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDDN" -w "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDPW" > /dev/null <<EOF
+dn: cn=$2,$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BASEDN
+changetype: modify
+delete: description
+EOF
+    ;;
+    *)
+      ultrapossum_removeconf_shell "$1" "$2"
+    ;;
+  esac
+}
+
+# ultrapossum_removeconf_shell <category> <var>
+ultrapossum_removeconf_shell() {
+  if test "x$1" = "x."; then
+    config=$SYSCONFDIR/ultrapossum.cf
+  elif test "x$1" = "xsecret"; then
+    config=$SYSCONFDIR/secret.cf
+  elif test "x$1" = "x.status"; then
+    config=$localstatedir/lib/$PACKAGE/status
+  else
+    config=$SYSCONFDIR/module.d/$1.cf
+  fi
+  if test -f "$config"; then
+    removetmp=`tempfile`
+    /bin/cp -p $config $removetmp
+    egrep -v "^$2=" $config > $removetmp || true
+    /bin/cp -p $removetmp $config
+    /bin/rm -f $removetmp
+  fi
 }
 
 # ultrapossum_parse_config <config>


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 20:52:18 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 20:52:18 +0900
Subject: [Ultrapossum-cvs 475] ultrapossum/init.d 1.5,1.6,10config
Message-ID: <20040917115218.6706A2AC048@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/init.d/10config,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ultrapossum/init.d/10config	2004/09/17 11:26:25	1.5
+++ ultrapossum/init.d/10config	2004/09/17 11:52:18	1.6
@@ -84,11 +84,13 @@
 ultrapossum_removeconf() {
   case "$ULTRAPOSSUM_CONFIG_BACKEND" in
     ldap)
+      if test "x${!2}" != "x"; then
         ldapmodify -x -H "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_URI" -D "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDDN" -w "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDPW" > /dev/null <<EOF
 dn: cn=$2,$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BASEDN
 changetype: modify
 delete: description
 EOF
+      fi
     ;;
     *)
       ultrapossum_removeconf_shell "$1" "$2"


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 20:57:29 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 20:57:29 +0900
Subject: [Ultrapossum-cvs 476] plugin/slapd/debian 1.5,1.6,control
Message-ID: <20040917115729.BBDFA2AC011@users.sourceforge.jp>

===================================================================
RCS file: plugin/slapd/debian/control,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin/slapd/debian/control	2004/09/15 07:21:50	1.5
+++ plugin/slapd/debian/control	2004/09/17 11:57:29	1.6
@@ -7,7 +7,7 @@
 
 Package: ultrapossum-slapd
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, db4.2-util
+Depends: ${shlibs:Depends}, ${misc:Depends}, db4.2-util, ultrapossum-common
 Provides: slapd
 Conflicts: ultrapossum-server (<< 0.1beta6-0pre11)
 Description: UltraPossum plugin to use slapd optimized for UltraPossum


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 20:57:39 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 20:57:39 +0900
Subject: [Ultrapossum-cvs 477] plugin/slapd/debian 1.4,1.5,rules
Message-ID: <20040917115739.AE20D2AC048@users.sourceforge.jp>

===================================================================
RCS file: plugin/slapd/debian/rules,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin/slapd/debian/rules	2004/09/15 08:56:09	1.4
+++ plugin/slapd/debian/rules	2004/09/17 11:57:39	1.5
@@ -38,6 +38,7 @@
 
 	# Add here commands to compile the package.
 	$(MAKE)
+	$(MAKE) check
 
 	touch build-stamp
 


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 21:10:11 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 21:10:11 +0900
Subject: [Ultrapossum-cvs 478] ultrapossum/module/server 1.11,1.12,10server
Message-ID: <20040917121011.2BE932AC011@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/server/10server,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ultrapossum/module/server/10server	2004/09/17 07:10:31	1.11
+++ ultrapossum/module/server/10server	2004/09/17 12:10:11	1.12
@@ -247,6 +247,7 @@
   SLAPROOTPW="XXXXXXXX"
 fi
 
+TYPE=client
 if test "x$MASTER" = "x$HOST" || test "x$BACKUP" = "x$HOST" || include "$HOST" "$SYNCBACKUPS"; then
   TYPE=master
 else


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 21:43:08 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 21:43:08 +0900
Subject: [Ultrapossum-cvs 479] ultrapossum/module/server 1.9,1.10,sshman
Message-ID: <20040917124308.866A62AC011@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/server/sshman,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ultrapossum/module/server/sshman	2004/09/17 07:10:04	1.9
+++ ultrapossum/module/server/sshman	2004/09/17 12:43:08	1.10
@@ -43,7 +43,7 @@
 
 # cmd <host> <cmd>
 cmd() {
-  getconfig | ssh -T -i $SSHKEYDIR/$2/id_rsa $1
+  getconfig | ssh -T -i $SSHKEYDIR/$2/id_rsa $1 $MODULEDIR/server/$2
 }
 
 case "x$1" in


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 21:44:02 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 21:44:02 +0900
Subject: [Ultrapossum-cvs 480] ultrapossum/init.d 1.3,1.4,15variable
Message-ID: <20040917124402.88D552AC011@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/init.d/15variable,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ultrapossum/init.d/15variable	2004/09/17 10:55:57	1.3
+++ ultrapossum/init.d/15variable	2004/09/17 12:44:02	1.4
@@ -10,10 +10,10 @@
 LDAPMASTER=`ultrapossum_getconf LDAPMASTER $HOST`
 SLAVES=`ultrapossum_getconf SLAVES ""`
 
-SECRETCF=""
-APPDNMODE=""
-ULTRAPOSSUM_ENCODE=""
-ULTRAPOSSUM_DECODE=""
+SECRETCF=`ultrapossum_getconf SECRETCF ""`
+APPDNMODE=`ultrapossum_getconf APPDNMODE ""`
+ULTRAPOSSUM_ENCODE=`ultrapossum_getconf ULTRAPOSSUM_ENCODE ""`
+ULTRAPOSSUM_DECODE=`ultrapossum_getconf ULTRAPOSSUM_DECODE ""`
 
 else
   . $CACHEDIR/$cache


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 21:47:44 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 21:47:44 +0900
Subject: [Ultrapossum-cvs 481] ultrapossum/init.d 1.6,1.7,10config
Message-ID: <20040917124744.864632AC048@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/init.d/10config,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ultrapossum/init.d/10config	2004/09/17 11:52:18	1.6
+++ ultrapossum/init.d/10config	2004/09/17 12:47:44	1.7
@@ -9,10 +9,12 @@
   ldap)
     ldapsearch -LLL -x -H "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_URI" -b "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BASEDN" -D "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDDN" -w "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDPW" description=\* cn description  | egrep '(cn:|description:)' | uniq | while read cn; do
     read description
-    cn=`echo $cn | cut -d' ' -f2-`
-    description=`echo $description | cut -d' ' -f2-`
-    if test "x${!cn}" = "x"; then
-      echo "$cn='$description'"
+    if echo $description | grep -v :: > /dev/null; then
+      cn=`echo $cn | cut -d' ' -f2-`
+      description=`echo $description | cut -d' ' -f2-`
+      if test "x${!cn}" = "x"; then
+        echo "$cn='$description'"
+      fi
     fi
   done
   ;;


From taru ¡÷ users.sourceforge.jp  Fri Sep 17 21:52:41 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 17 Sep 2004 21:52:41 +0900
Subject: [Ultrapossum-cvs 482] ultrapossum/init.d 1.4,1.5,15variable
Message-ID: <20040917125241.D95FF2AC048@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/init.d/15variable,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ultrapossum/init.d/15variable	2004/09/17 12:44:02	1.4
+++ ultrapossum/init.d/15variable	2004/09/17 12:52:41	1.5
@@ -26,7 +26,7 @@
   ;;
   *)
     eval "`ultrapossum_parse_config_shell "$ULTRAPOSSUMCF"`"
-    eval "`ultrapossum_parse_config_shell "$SYSCONFDIR/secret.cf"`"
+    eval "`ultrapossum_parse_config_shell "$SYSCONFDIR/secret.cf" 2> /dev/null`"
   ;;
 esac
 


From taru ¡÷ users.sourceforge.jp  Mon Sep 20 12:01:37 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Mon, 20 Sep 2004 12:01:37 +0900
Subject: [Ultrapossum-cvs 483] ultrapossum/debian ...
Message-ID: <20040920030137.0F8F22AC01E@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/ultrapossum-common.config,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ultrapossum/debian/ultrapossum-common.config	2004/09/16 16:05:52	1.9
+++ ultrapossum/debian/ultrapossum-common.config	2004/09/20 03:01:36	1.10
@@ -31,11 +31,14 @@
   # initial preconfiguration should come here
   ORGANIZATION="`hostname`"
   ULTRAPOSSUM_CONFIG_BACKEND_LDAP_URI="ldap://$ORGANIZATION/"
+  if test -f "/etc/ultrapossum/config.cf"; then
+    . /etc/ultrapossum/config.cf
+  fi
   if test -f "/etc/ultrapossum/ultrapossum.cf"; then
     . /etc/ultrapossum/ultrapossum.cf
   fi
-  if test -f "/etc/ultrapossum/config.cf"; then
-    . /etc/ultrapossum/config.cf
+  if test -f "/etc/ultrapossum/secret.cf"; then
+    . /etc/ultrapossum/secret.cf
   fi
 fi
 
@@ -55,6 +58,8 @@
 
 set ultrapossum-common/suffix "$SUFFIX"
 set ultrapossum-common/organization "$ORGANIZATION"
+set ultrapossum-common/rootpw "$ROOTPW"
+set ultrapossum-common/rootpw2 "$ROOTPW"
 set ultrapossum-common/config_backend_ldap_uri "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_URI"
 set ultrapossum-common/config_backend_ldap_basedn "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BASEDN"
 set ultrapossum-common/config_backend_ldap_binddn "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDDN"
@@ -92,12 +97,28 @@
         *)
           db_input medium ultrapossum-common/organization || true
           db_input low ultrapossum-common/suffix || true
-	  if ! db_go; then
-	    STATE=backend
-	  else
-            STATE=end
-	  fi
+          STATE=rootpw
       esac
+    ;;
+    rootpw)
+      db_input high ultrapossum-common/rootpw || true
+      db_input high ultrapossum-common/rootpw2 || true
+      if ! db_go; then
+        STATE=backend
+      else
+        db_get ultrapossum-common/rootpw
+        rootpw="$RET"
+        db_get ultrapossum-common/rootpw2
+        if test "$rootpw" != "$RET"; then
+          db_fset ultrapossum-common/missmatch unseen true || true
+          db_input medium ultrapossum-common/missmatch || true
+          db_go || true
+          db_fset ultrapossum-common/rootpw seen false
+          db_fset ultrapossum-common/rootpw2 seen false
+        else
+          STATE=end
+        fi
+      fi
     ;;
     ldapstart)
       db_input low ultrapossum-common/config_backend_ldap_uri || true
===================================================================
RCS file: ultrapossum/debian/ultrapossum-common.postinst,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ultrapossum/debian/ultrapossum-common.postinst	2004/09/16 18:30:12	1.8
+++ ultrapossum/debian/ultrapossum-common.postinst	2004/09/20 03:01:36	1.9
@@ -41,6 +41,14 @@
   fi
 }
 
+# setsecretconfig <template_base> <var>
+setsecretconfig() {
+  db_get ultrapossum-common/$1
+  if test "x$RET" != "x${!2}"; then
+    ultrapossum-config set secret $2="$RET"
+  fi
+}
+
 case "$1" in
     configure)
 	ultrapossum-config remove . SUFFIX
@@ -69,6 +77,14 @@
 
 	setconfig suffix SUFFIX
 	setconfig organization ORGANIZATION
+
+	db_get ultrapossum-common/rootpw
+	if test "x$RET" = "x"; then
+	  echo -n "Creating password for admin... " 1>&2
+	  db_set ultrapossum-common/rootpw "`makepasswd`"
+	  echo "done" 1>&2
+  	fi
+        setsecretconfig rootpw ROOTPW
 
         db_get ultrapossum-common/config_backend
         case "$RET" in
===================================================================
RCS file: ultrapossum/debian/ultrapossum-common.templates,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ultrapossum/debian/ultrapossum-common.templates	2004/09/16 16:05:52	1.6
+++ ultrapossum/debian/ultrapossum-common.templates	2004/09/20 03:01:36	1.7
@@ -10,6 +10,22 @@
  may want to select ldap backend. This backend holds them in LDAP
  directory.
 
+Template: ultrapossum-common/rootpw
+Type: password
+_Description: Password of the root DN
+ Specify the password of the root DN.
+
+Template: ultrapossum-common/rootpw2
+Type: password
+_Description: Retype password of the root DN
+ In order to check whether your password is correct, retype
+ the same password again.
+
+Template: ultrapossum-common/missmatch
+Type: note
+_Description: password miss match
+ Your password is different. Retype the password again.
+
 Template: ultrapossum-common/config_backend_ldap_uri
 Type: string
 _Description: LDAP URI where you connect
===================================================================
RCS file: ultrapossum/debian/ultrapossum-server.config,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ultrapossum/debian/ultrapossum-server.config	2004/09/16 15:43:39	1.22
+++ ultrapossum/debian/ultrapossum-server.config	2004/09/20 03:01:36	1.23
@@ -53,8 +53,8 @@
 set ultrapossum-server/master "$MASTER"
 set ultrapossum-server/slaves "$SLURPDSLAVES"
 
-set ultrapossum-server/rootpw "$ROOTPW"
-set ultrapossum-server/rootpw2 "$ROOTPW"
+set ultrapossum-common/rootpw "$ROOTPW"
+set ultrapossum-common/rootpw2 "$ROOTPW"
 
 if test "x$MASTER" = "x" || test "x$MASTER" = "x`hostname`"; then
   if test "x$SLURPDSLAVES" = "x"; then
@@ -87,7 +87,7 @@
     echo "SUFFIX=$RET" > $t
     db_get ultrapossum-server/rootrdn
     echo "ROOTDN=$RET" >> $t
-    db_get ultrapossum-server/rootpw
+    db_get ultrapossum-common/rootpw
     echo "ROOTPW=$RET" >> $t
     db_get ultrapossum-server/directory
     echo "DBDIRECTORY=$RET" >> $t
@@ -139,19 +139,19 @@
   ;;
 
   ROOTPW)
-    db_input medium ultrapossum-server/rootpw || true
-    db_input medium ultrapossum-server/rootpw2 || true
+    db_input medium ultrapossum-common/rootpw || true
+    db_input medium ultrapossum-common/rootpw2 || true
     if db_go; then
-      db_get ultrapossum-server/rootpw
+      db_get ultrapossum-common/rootpw
       rootpw=$RET
-      db_get ultrapossum-server/rootpw2
+      db_get ultrapossum-common/rootpw2
       rootpw2=$RET
       if [ "$rootpw" != "$rootpw2" ]; then
-        db_fset ultrapossum-server/missmatch unseen true || true
-        db_input medium ultrapossum-server/missmatch || true
+        db_fset ultrapossum-common/missmatch unseen true || true
+        db_input medium ultrapossum-common/missmatch || true
         db_go || true
-        db_set ultrapossum-server/rootpw $ROOTPW
-        db_set ultrapossum-server/rootpw2 $ROOTPW
+        db_set ultrapossum-common/rootpw $ROOTPW
+        db_set ultrapossum-common/rootpw2 $ROOTPW
       else
         if sanity; then
           db_get ultrapossum-server/type
@@ -219,8 +219,8 @@
       db_get ultrapossum-server/credentials2
       rootpw2=$RET
       if [ "$rootpw" != "$rootpw2" ]; then
-        db_fset ultrapossum-server/missmatch unseen true || true
-        db_input medium ultrapossum-server/missmatch || true
+        db_fset ultrapossum-common/missmatch unseen true || true
+        db_input medium ultrapossum-common/missmatch || true
         db_go || true
         db_set ultrapossum-server/credentials $CREDENTIALS
         db_set ultrapossum-server/credentials2 $CREDENTIALS
===================================================================
RCS file: ultrapossum/debian/ultrapossum-server.postinst,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ultrapossum/debian/ultrapossum-server.postinst	2004/09/16 18:30:12	1.27
+++ ultrapossum/debian/ultrapossum-server.postinst	2004/09/20 03:01:36	1.28
@@ -43,7 +43,7 @@
 
 # setsecretconfig <template_base> <var>
 setsecretconfig() {
-  db_get ultrapossum-server/$1
+  db_get $1
   if test "x$RET" != "x${!2}"; then
     ultrapossum-config set secret $2="$RET"
   fi
@@ -98,13 +98,13 @@
         setserverconfig rootrdn ROOTRDN
 	setserverconfig slaves SLURPDSLAVES
 
-	db_get ultrapossum-server/rootpw
+	db_get ultrapossum-common/rootpw
 	if test "x$RET" = "x"; then
 	  echo -n "Creating password for admin... " 1>&2
-	  db_set ultrapossum-server/rootpw "`makepasswd`"
+	  db_set ultrapossum-common/rootpw "`makepasswd`"
 	  echo "done" 1>&2
   	fi
-        setsecretconfig rootpw ROOTPW
+        setsecretconfig ultrapossum-common/rootpw ROOTPW
 
 	db_get ultrapossum-server/slaves
 	if test "x$RET" != "x"; then
@@ -115,7 +115,7 @@
 	    echo "done" 1>&2
 	  fi
 	fi
-        setsecretconfig credentials CREDENTIALS
+        setsecretconfig ultrapossum-server/credentials CREDENTIALS
 
 	db_stop
 
===================================================================
RCS file: ultrapossum/debian/ultrapossum-server.templates,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ultrapossum/debian/ultrapossum-server.templates	2004/04/02 09:34:54	1.8
+++ ultrapossum/debian/ultrapossum-server.templates	2004/09/20 03:01:36	1.9
@@ -6,22 +6,6 @@
  UltraPossum directory. For example, no access control nor search limit
  are performed at all.
 
-Template: ultrapossum-server/rootpw
-Type: password
-_Description: Password of the root DN
- Specify the password of the root DN.
-
-Template: ultrapossum-server/rootpw2
-Type: password
-_Description: Retype password of the root DN
- In order to check whether your password is correct, retype
- the same password again.
-
-Template: ultrapossum-server/missmatch
-Type: note
-_Description: password miss match
- Your password is different. Retype the password again.
-
 Template: ultrapossum-server/directory
 Type: string
 _Default: /var/lib/ultrapossum/db


From taru ¡÷ users.sourceforge.jp  Mon Sep 20 12:01:37 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Mon, 20 Sep 2004 12:01:37 +0900
Subject: [Ultrapossum-cvs 484] ultrapossum/debian/po 1.12, 1.13, ja.po 1.11,
	1.12, templates.pot
Message-ID: <20040920030137.28BEE2AC025@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/po/ja.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ultrapossum/debian/po/ja.po	2004/09/16 16:05:52	1.12
+++ ultrapossum/debian/po/ja.po	2004/09/20 03:01:37	1.13
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: ultrapossum 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-17 01:02+0900\n"
+"POT-Creation-Date: 2004-09-20 11:52+0900\n"
 "PO-Revision-Date: 2004-04-01 19:41+0900\n"
 "Last-Translator: Masato Taruishi <taru ¡÷ debian.org>\n"
 "Language-Team: Japanese <taru ¡÷ valinux.co.jp>\n"
@@ -40,60 +40,98 @@
 "backend. This backend holds them in LDAP directory."
 msgstr ""
 
-#. Type: string
+#. Type: password
 #. Description
 #: ../ultrapossum-common.templates:15
+msgid "Password of the root DN"
+msgstr "¥ë¡¼¥ÈDN¤Î¥Ñ¥¹¥ï¡¼¥É"
+
+#. Type: password
+#. Description
+#: ../ultrapossum-common.templates:15
+msgid "Specify the password of the root DN."
+msgstr "¥ë¡¼¥ÈDN¤Î¥Ñ¥¹¥ï¡¼¥É¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£"
+
+#. Type: password
+#. Description
+#: ../ultrapossum-common.templates:20
+msgid "Retype password of the root DN"
+msgstr "¥ë¡¼¥ÈDN¤Î¥Ñ¥¹¥ï¡¼¥É(³Îǧ)"
+
+#. Type: password
+#. Description
+#: ../ultrapossum-common.templates:20
+msgid ""
+"In order to check whether your password is correct, retype the same password "
+"again."
+msgstr "¥Ñ¥¹¥ï¡¼¥É¤òÀµ¤·¤¯ÆþÎϤ·¤¿¤«Ä´¤Ù¤ë¤¿¤á¤Ë¤â¤¦°ìÅÙƱ¤¸¥Ñ¥¹¥ï¡¼¥É¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£"
+
+#. Type: note
+#. Description
+#: ../ultrapossum-common.templates:26
+msgid "password miss match"
+msgstr "¥Ñ¥¹¥ï¡¼¥É¤¬°ìÃפ·¤Þ¤»¤ó"
+
+#. Type: note
+#. Description
+#: ../ultrapossum-common.templates:26
+msgid "Your password is different. Retype the password again."
+msgstr "¥Ñ¥¹¥ï¡¼¥É¤¬°Û¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£¤â¤¦°ìÅ٥ѥ¹¥ï¡¼¥É¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£"
+
+#. Type: string
+#. Description
+#: ../ultrapossum-common.templates:31
 msgid "LDAP URI where you connect"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:20
+#: ../ultrapossum-common.templates:36
 msgid "BaseDN to search"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:25
+#: ../ultrapossum-common.templates:41
 msgid "BindDN to search"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../ultrapossum-common.templates:29
+#: ../ultrapossum-common.templates:45
 #, fuzzy
 msgid "password to search"
 msgstr "¥Ñ¥¹¥ï¡¼¥É¤¬°ìÃפ·¤Þ¤»¤ó"
 
 #. Type: password
 #. Description
-#: ../ultrapossum-common.templates:33
+#: ../ultrapossum-common.templates:49
 #, fuzzy
 msgid "retype password to search"
 msgstr "¥ë¡¼¥ÈDN¤Î¥Ñ¥¹¥ï¡¼¥É(³Îǧ)"
 
 #. Type: Note
 #. Description
-#: ../ultrapossum-common.templates:37
+#: ../ultrapossum-common.templates:53
 #, fuzzy
 msgid "password mismatch"
 msgstr "¥Ñ¥¹¥ï¡¼¥É¤¬°ìÃפ·¤Þ¤»¤ó"
 
 #. Type: Note
 #. Description
-#: ../ultrapossum-common.templates:41
+#: ../ultrapossum-common.templates:57
 msgid "Configuration not found there"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:46
+#: ../ultrapossum-common.templates:62
 msgid "Top level DN (Distungnished Name)"
 msgstr "ºÇ¾å°Ì DN (¼±ÊÌ̾)"
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:46
+#: ../ultrapossum-common.templates:62
 msgid ""
 "In LDAP, every entry has the unique identifier called DN (Distungnished "
 "Name). Because DN is tree structure, you need to specify the root entry "
@@ -102,13 +140,13 @@
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:53
+#: ../ultrapossum-common.templates:69
 msgid "Which organization do you want to join?"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:53
+#: ../ultrapossum-common.templates:69
 msgid ""
 " Organization is domain of UltraPossum configuartion.\n"
 " Configurations of all servers in a domain are shared."
@@ -116,19 +154,19 @@
 
 #. Type: boolean
 #. Description
-#: ../ultrapossum-common.templates:60
+#: ../ultrapossum-common.templates:76
 msgid "Your configuration is invalid. Continue to configure?"
 msgstr "ÀßÄ̵꤬¸ú¤Ç¤¹¡£ÀßÄê¤ò·Ñ³¤·¤Þ¤¹¤«?"
 
 #. Type: boolean
 #. Description
-#: ../ultrapossum-common.templates:60
+#: ../ultrapossum-common.templates:76
 msgid " ${description}"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../ultrapossum-common.templates:60
+#: ../ultrapossum-common.templates:76
 msgid ""
 "If you keep this configuration, ultrapossum probably will not work "
 "correctly. You can reconfigure it again instead of continuing to configure."
@@ -155,59 +193,21 @@
 "all."
 msgstr "¥¹¡¼¥Ñ¥æ¡¼¥¶Ì¾¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤. ¤³¤Î¥æ¡¼¥¶¤Ï UltraPossum ¥Ç¥£¥ì¥¯¥È¥ê¤ËÂФ·¤ÆÁ´¤Æ¤Î»ö¤¬¹Ô¤¨¤Þ¤¹. Î㤨¤Ð, ¥¢¥¯¥»¥¹À©¸æ¤ä¸¡º÷À©¸Â¤Ï¥Á¥§¥Ã¥¯¤µ¤ì¤Þ¤»¤ó¡£"
 
-#. Type: password
-#. Description
-#: ../ultrapossum-server.templates:11
-msgid "Password of the root DN"
-msgstr "¥ë¡¼¥ÈDN¤Î¥Ñ¥¹¥ï¡¼¥É"
-
-#. Type: password
-#. Description
-#: ../ultrapossum-server.templates:11
-msgid "Specify the password of the root DN."
-msgstr "¥ë¡¼¥ÈDN¤Î¥Ñ¥¹¥ï¡¼¥É¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£"
-
-#. Type: password
-#. Description
-#: ../ultrapossum-server.templates:16
-msgid "Retype password of the root DN"
-msgstr "¥ë¡¼¥ÈDN¤Î¥Ñ¥¹¥ï¡¼¥É(³Îǧ)"
-
-#. Type: password
-#. Description
-#: ../ultrapossum-server.templates:16
-msgid ""
-"In order to check whether your password is correct, retype the same password "
-"again."
-msgstr "¥Ñ¥¹¥ï¡¼¥É¤òÀµ¤·¤¯ÆþÎϤ·¤¿¤«Ä´¤Ù¤ë¤¿¤á¤Ë¤â¤¦°ìÅÙƱ¤¸¥Ñ¥¹¥ï¡¼¥É¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£"
-
-#. Type: note
-#. Description
-#: ../ultrapossum-server.templates:22
-msgid "password miss match"
-msgstr "¥Ñ¥¹¥ï¡¼¥É¤¬°ìÃפ·¤Þ¤»¤ó"
-
-#. Type: note
-#. Description
-#: ../ultrapossum-server.templates:22
-msgid "Your password is different. Retype the password again."
-msgstr "¥Ñ¥¹¥ï¡¼¥É¤¬°Û¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£¤â¤¦°ìÅ٥ѥ¹¥ï¡¼¥É¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£"
-
 #. Type: string
 #. Default
-#: ../ultrapossum-server.templates:27
+#: ../ultrapossum-server.templates:11
 msgid "/var/lib/ultrapossum/db"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-server.templates:28
+#: ../ultrapossum-server.templates:12
 msgid "Datbase directory"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¥Ç¥£¥ì¥¯¥È¥ê"
 
 #. Type: string
 #. Description
-#: ../ultrapossum-server.templates:28
+#: ../ultrapossum-server.templates:12
 msgid ""
 "UltraPossum holds directory information as a internal database. You can "
 "specify the directory where the internal database is located."
@@ -215,19 +215,19 @@
 
 #. Type: select
 #. Choices
-#: ../ultrapossum-server.templates:34
+#: ../ultrapossum-server.templates:18
 msgid "standalone, master, slave"
 msgstr "¥¹¥¿¥ó¥É¥¢¥í¡¼¥ó, ¥Þ¥¹¥¿, ¥¹¥ì¡¼¥Ö"
 
 #. Type: select
 #. Description
-#: ../ultrapossum-server.templates:36
+#: ../ultrapossum-server.templates:20
 msgid "LDAP Server type"
 msgstr "LDAP¥µ¡¼¥Ð¤Î¼ïÎà"
 
 #. Type: select
 #. Description
-#: ../ultrapossum-server.templates:36
+#: ../ultrapossum-server.templates:20
 msgid ""
 "In LDAP server, there are 2 types of server. One is master and second is "
 "slave server. Master server is primary LDAP server which allows to be "
@@ -237,43 +237,43 @@
 
 #. Type: string
 #. Description
-#: ../ultrapossum-server.templates:44
+#: ../ultrapossum-server.templates:28
 msgid "Master server"
 msgstr "¥Þ¥¹¥¿¡¼¥µ¡¼¥Ð"
 
 #. Type: string
 #. Description
-#: ../ultrapossum-server.templates:44
+#: ../ultrapossum-server.templates:28
 msgid "Specify the hostname of the master server."
 msgstr "¥Þ¥¹¥¿¥µ¡¼¥Ð¤Î¥Û¥¹¥È̾¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£"
 
 #. Type: string
 #. Description
-#: ../ultrapossum-server.templates:49
+#: ../ultrapossum-server.templates:33
 msgid "List of slave servers"
 msgstr "¥¹¥ì¡¼¥Ö¥µ¡¼¥Ð¤Î°ìÍ÷"
 
 #. Type: string
 #. Description
-#: ../ultrapossum-server.templates:49
+#: ../ultrapossum-server.templates:33
 msgid "Specify the list of slave servers separated by spaces."
 msgstr "¶õÇò¤Ç¶èÀڤä¿¥¹¥ì¡¼¥Ö¥µ¡¼¥Ð¤Î¥ê¥¹¥È¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£"
 
 #. Type: string
 #. Default
-#: ../ultrapossum-server.templates:54
+#: ../ultrapossum-server.templates:38
 msgid "cn=replica,ou=application"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-server.templates:55
+#: ../ultrapossum-server.templates:39
 msgid "Update RDN"
 msgstr "¹¹¿·RDN"
 
 #. Type: string
 #. Description
-#: ../ultrapossum-server.templates:55
+#: ../ultrapossum-server.templates:39
 msgid ""
 "In slave server, you can limit who can modify the directory to keep "
 "directory consistency. Only this DN can modify it."
@@ -281,43 +281,43 @@
 
 #. Type: password
 #. Description
-#: ../ultrapossum-server.templates:61
+#: ../ultrapossum-server.templates:45
 msgid "credentials for replication"
 msgstr "¥ê¥×¥ê¥±¡¼¥·¥ç¥óÍѤΥѥ¹¥ï¡¼¥É"
 
 #. Type: password
 #. Description
-#: ../ultrapossum-server.templates:61
+#: ../ultrapossum-server.templates:45
 msgid "Specify the password of the replication."
 msgstr "¥ì¥×¥ê¥±¡¼¥·¥ç¥óÍѥѥ¹¥ï¡¼¥É¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£"
 
 #. Type: password
 #. Description
-#: ../ultrapossum-server.templates:66
+#: ../ultrapossum-server.templates:50
 msgid "Retype credentials for replication"
 msgstr "¥ê¥×¥ê¥±¡¼¥·¥ç¥óÍѤΥѥ¹¥ï¡¼¥É(³Îǧ)"
 
 #. Type: string
 #. Description
-#: ../ultrapossum-server.templates:70
+#: ../ultrapossum-server.templates:54
 msgid "Replog directory"
 msgstr "Replog¥Ç¥£¥ì¥¯¥È¥ê"
 
 #. Type: string
 #. Description
-#: ../ultrapossum-server.templates:70
+#: ../ultrapossum-server.templates:54
 msgid "Replog is a log file which stores replication information."
 msgstr "Replog ¤Ï¥ì¥×¥ê¥±¡¼¥·¥ç¥ó¾ðÊó¤òÊݸ¤¹¤ë¥í¥°¥Õ¥¡¥¤¥ë¤Ç¤¹¡£"
 
 #. Type: boolean
 #. Description
-#: ../ultrapossum-server.templates:76
+#: ../ultrapossum-server.templates:60
 msgid "All informations prepared. Are you sure to continue?"
 msgstr "¾ðÊ󤬽¸¤Þ¤ê¤Þ¤·¤¿¡£ËÜÅö¤ËÀßÄê¤ò¹Ô¤¤¤Þ¤¹¤«?"
 
 #. Type: boolean
 #. Description
-#: ../ultrapossum-server.templates:76
+#: ../ultrapossum-server.templates:60
 msgid ""
 "Now you specified all informations enough to configure the UltraPossum "
 "server. You can select to edit these informations again before setting "
===================================================================
RCS file: ultrapossum/debian/po/templates.pot,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ultrapossum/debian/po/templates.pot	2004/09/16 16:05:52	1.11
+++ ultrapossum/debian/po/templates.pot	2004/09/20 03:01:37	1.12
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-17 01:02+0900\n"
+"POT-Creation-Date: 2004-09-20 11:52+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL ¡÷ ADDRESS>\n"
 "Language-Team: LANGUAGE <LL ¡÷ li.org>\n"
@@ -41,57 +41,95 @@
 "backend. This backend holds them in LDAP directory."
 msgstr ""
 
-#. Type: string
+#. Type: password
 #. Description
 #: ../ultrapossum-common.templates:15
+msgid "Password of the root DN"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../ultrapossum-common.templates:15
+msgid "Specify the password of the root DN."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../ultrapossum-common.templates:20
+msgid "Retype password of the root DN"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../ultrapossum-common.templates:20
+msgid ""
+"In order to check whether your password is correct, retype the same password "
+"again."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../ultrapossum-common.templates:26
+msgid "password miss match"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../ultrapossum-common.templates:26
+msgid "Your password is different. Retype the password again."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ultrapossum-common.templates:31
 msgid "LDAP URI where you connect"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:20
+#: ../ultrapossum-common.templates:36
 msgid "BaseDN to search"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:25
+#: ../ultrapossum-common.templates:41
 msgid "BindDN to search"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../ultrapossum-common.templates:29
+#: ../ultrapossum-common.templates:45
 msgid "password to search"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../ultrapossum-common.templates:33
+#: ../ultrapossum-common.templates:49
 msgid "retype password to search"
 msgstr ""
 
 #. Type: Note
 #. Description
-#: ../ultrapossum-common.templates:37
+#: ../ultrapossum-common.templates:53
 msgid "password mismatch"
 msgstr ""
 
 #. Type: Note
 #. Description
-#: ../ultrapossum-common.templates:41
+#: ../ultrapossum-common.templates:57
 msgid "Configuration not found there"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:46
+#: ../ultrapossum-common.templates:62
 msgid "Top level DN (Distungnished Name)"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:46
+#: ../ultrapossum-common.templates:62
 msgid ""
 "In LDAP, every entry has the unique identifier called DN (Distungnished "
 "Name). Because DN is tree structure, you need to specify the root entry "
@@ -100,13 +138,13 @@
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:53
+#: ../ultrapossum-common.templates:69
 msgid "Which organization do you want to join?"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:53
+#: ../ultrapossum-common.templates:69
 msgid ""
 " Organization is domain of UltraPossum configuartion.\n"
 " Configurations of all servers in a domain are shared."
@@ -114,19 +152,19 @@
 
 #. Type: boolean
 #. Description
-#: ../ultrapossum-common.templates:60
+#: ../ultrapossum-common.templates:76
 msgid "Your configuration is invalid. Continue to configure?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../ultrapossum-common.templates:60
+#: ../ultrapossum-common.templates:76
 msgid " ${description}"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../ultrapossum-common.templates:60
+#: ../ultrapossum-common.templates:76
 msgid ""
 "If you keep this configuration, ultrapossum probably will not work "
 "correctly. You can reconfigure it again instead of continuing to configure."
@@ -153,59 +191,21 @@
 "all."
 msgstr ""
 
-#. Type: password
-#. Description
-#: ../ultrapossum-server.templates:11
-msgid "Password of the root DN"
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../ultrapossum-server.templates:11
-msgid "Specify the password of the root DN."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../ultrapossum-server.templates:16
-msgid "Retype password of the root DN"
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../ultrapossum-server.templates:16
-msgid ""
-"In order to check whether your password is correct, retype the same password "
-"again."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../ultrapossum-server.templates:22
-msgid "password miss match"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../ultrapossum-server.templates:22
-msgid "Your password is different. Retype the password again."
-msgstr ""
-
 #. Type: string
 #. Default
-#: ../ultrapossum-server.templates:27
+#: ../ultrapossum-server.templates:11
 msgid "/var/lib/ultrapossum/db"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-server.templates:28
+#: ../ultrapossum-server.templates:12
 msgid "Datbase directory"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-server.templates:28
+#: ../ultrapossum-server.templates:12
 msgid ""
 "UltraPossum holds directory information as a internal database. You can "
 "specify the directory where the internal database is located."
@@ -213,19 +213,19 @@
 
 #. Type: select
 #. Choices
-#: ../ultrapossum-server.templates:34
+#: ../ultrapossum-server.templates:18
 msgid "standalone, master, slave"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../ultrapossum-server.templates:36
+#: ../ultrapossum-server.templates:20
 msgid "LDAP Server type"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../ultrapossum-server.templates:36
+#: ../ultrapossum-server.templates:20
 msgid ""
 "In LDAP server, there are 2 types of server. One is master and second is "
 "slave server. Master server is primary LDAP server which allows to be "
@@ -235,43 +235,43 @@
 
 #. Type: string
 #. Description
-#: ../ultrapossum-server.templates:44
+#: ../ultrapossum-server.templates:28
 msgid "Master server"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-server.templates:44
+#: ../ultrapossum-server.templates:28
 msgid "Specify the hostname of the master server."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-server.templates:49
+#: ../ultrapossum-server.templates:33
 msgid "List of slave servers"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-server.templates:49
+#: ../ultrapossum-server.templates:33
 msgid "Specify the list of slave servers separated by spaces."
 msgstr ""
 
 #. Type: string
 #. Default
-#: ../ultrapossum-server.templates:54
+#: ../ultrapossum-server.templates:38
 msgid "cn=replica,ou=application"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-server.templates:55
+#: ../ultrapossum-server.templates:39
 msgid "Update RDN"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-server.templates:55
+#: ../ultrapossum-server.templates:39
 msgid ""
 "In slave server, you can limit who can modify the directory to keep "
 "directory consistency. Only this DN can modify it."
@@ -279,43 +279,43 @@
 
 #. Type: password
 #. Description
-#: ../ultrapossum-server.templates:61
+#: ../ultrapossum-server.templates:45
 msgid "credentials for replication"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../ultrapossum-server.templates:61
+#: ../ultrapossum-server.templates:45
 msgid "Specify the password of the replication."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../ultrapossum-server.templates:66
+#: ../ultrapossum-server.templates:50
 msgid "Retype credentials for replication"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-server.templates:70
+#: ../ultrapossum-server.templates:54
 msgid "Replog directory"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-server.templates:70
+#: ../ultrapossum-server.templates:54
 msgid "Replog is a log file which stores replication information."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../ultrapossum-server.templates:76
+#: ../ultrapossum-server.templates:60
 msgid "All informations prepared. Are you sure to continue?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../ultrapossum-server.templates:76
+#: ../ultrapossum-server.templates:60
 msgid ""
 "Now you specified all informations enough to configure the UltraPossum "
 "server. You can select to edit these informations again before setting "


From taru ¡÷ users.sourceforge.jp  Tue Sep 21 13:06:10 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 21 Sep 2004 13:06:10 +0900
Subject: [Ultrapossum-cvs 484] ultrapossum/debian 1.52,1.53,changelog
Message-ID: <20040921040610.03A722AC02B@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/changelog,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- ultrapossum/debian/changelog	2004/09/17 11:26:24	1.52
+++ ultrapossum/debian/changelog	2004/09/21 04:06:09	1.53
@@ -1,3 +1,9 @@
+ultrapossum (0.1beta9-0pre3) unstable; urgency=low
+
+  * rootpw is now set in ultrapossum-common debconf, too.
+
+ -- Masato Taruishi <taru ¡÷ valinux.co.jp>  Tue, 21 Sep 2004 13:03:58 +0900
+
 ultrapossum (0.1beta9-0pre2) unstable; urgency=low
 
   * Applied the latest upstream version.


From taru ¡÷ users.sourceforge.jp  Tue Sep 21 13:42:52 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 21 Sep 2004 13:42:52 +0900
Subject: [Ultrapossum-cvs 485] ultrapossum/debian 1.9, 1.10,
	ultrapossum-common.postinst
Message-ID: <20040921044252.78ADD2AC02B@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/ultrapossum-common.postinst,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ultrapossum/debian/ultrapossum-common.postinst	2004/09/20 03:01:36	1.9
+++ ultrapossum/debian/ultrapossum-common.postinst	2004/09/21 04:42:52	1.10
@@ -51,43 +51,18 @@
 
 case "$1" in
     configure)
-	ultrapossum-config remove . SUFFIX
-	ultrapossum-config remove . ORGANIZATION
 
-        db_get ultrapossum-common/config_backend
-	case "$RET" in
-	  ldap)
-	    :
-	  ;;
-	  *)
-	    install -d /etc/ultrapossum/
-	    ucf /usr/share/ultrapossum/ucf/ultrapossum/ultrapossum.cf \
-			/etc/ultrapossum/ultrapossum.cf
-	  ;;
-	esac
 	for f in config.cf debian.cf secret.cf
 	do
 	        install -d `dirname /etc/ultrapossum/$f`
 		ucf /usr/share/ultrapossum/ucf/ultrapossum/$f \
 			/etc/ultrapossum/$f
 	done
-
+	
 	eval `ultrapossum-config init`
-	trap "eval `ultrapossum-config term`" 0
-
-	setconfig suffix SUFFIX
-	setconfig organization ORGANIZATION
-
-	db_get ultrapossum-common/rootpw
-	if test "x$RET" = "x"; then
-	  echo -n "Creating password for admin... " 1>&2
-	  db_set ultrapossum-common/rootpw "`makepasswd`"
-	  echo "done" 1>&2
-  	fi
-        setsecretconfig rootpw ROOTPW
-
         db_get ultrapossum-common/config_backend
-        case "$RET" in
+	backend="$RET"
+        case "$backend" in
           ldap)
 	    setconfig_backend config_backend ULTRAPOSSUM_CONFIG_BACKEND
 	    setconfig_backend config_backend_ldap_uri ULTRAPOSSUM_CONFIG_BACKEND_LDAP_URI
@@ -97,7 +72,34 @@
           ;;
           *)
             ultrapossum_setconf_shell /etc/ultrapossum/config.cf ULTRAPOSSUM_CONFIG_BACKEND ""
+	    install -d /etc/ultrapossum/
+	    ucf /usr/share/ultrapossum/ucf/ultrapossum/ultrapossum.cf \
+			/etc/ultrapossum/ultrapossum.cf
           ;;
+        esac
+	eval `ultrapossum-config term`
+
+        case "$backend" in
+	  ldap)
+	  ;;
+	  *)
+	    ultrapossum-config remove . SUFFIX
+	    ultrapossum-config remove . ORGANIZATION
+
+	    eval `ultrapossum-config init`
+	    trap "eval `ultrapossum-config term`" 0
+
+	    setconfig suffix SUFFIX
+	    setconfig organization ORGANIZATION
+
+	    db_get ultrapossum-common/rootpw
+	    if test "x$RET" = "x"; then
+	      echo -n "Creating password for admin... " 1>&2
+	      db_set ultrapossum-common/rootpw "`makepasswd`"
+	      echo "done" 1>&2
+            fi
+            setsecretconfig rootpw ROOTPW
+	  ;;
         esac
 	chmod 1777 /var/cache/ultrapossum/
     ;;


From taru ¡÷ users.sourceforge.jp  Tue Sep 21 13:43:22 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 21 Sep 2004 13:43:22 +0900
Subject: [Ultrapossum-cvs 486] ultrapossum/debian 1.53,1.54,changelog
Message-ID: <20040921044323.000FC2AC02B@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/changelog,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- ultrapossum/debian/changelog	2004/09/21 04:06:09	1.53
+++ ultrapossum/debian/changelog	2004/09/21 04:43:22	1.54
@@ -1,8 +1,9 @@
 ultrapossum (0.1beta9-0pre3) unstable; urgency=low
 
   * rootpw is now set in ultrapossum-common debconf, too.
+  * fix config backend bootstrap configuration in ultrapossum-common.
 
- -- Masato Taruishi <taru ¡÷ valinux.co.jp>  Tue, 21 Sep 2004 13:03:58 +0900
+ -- Masato Taruishi <taru ¡÷ valinux.co.jp>  Tue, 21 Sep 2004 13:41:29 +0900
 
 ultrapossum (0.1beta9-0pre2) unstable; urgency=low
 


From taru ¡÷ users.sourceforge.jp  Tue Sep 21 13:58:38 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 21 Sep 2004 13:58:38 +0900
Subject: [Ultrapossum-cvs 487] ultrapossum/debian 1.10, 1.11,
	ultrapossum-common.postinst
Message-ID: <20040921045838.1C4702AC02B@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/ultrapossum-common.postinst,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ultrapossum/debian/ultrapossum-common.postinst	2004/09/21 04:42:52	1.10
+++ ultrapossum/debian/ultrapossum-common.postinst	2004/09/21 04:58:38	1.11
@@ -49,6 +49,31 @@
   fi
 }
 
+set_config_backend() {
+  (
+  eval `ultrapossum-config init`
+  db_get ultrapossum-common/config_backend
+  backend="$RET"
+  case "$backend" in
+    ldap)
+      setconfig_backend config_backend ULTRAPOSSUM_CONFIG_BACKEND
+      setconfig_backend config_backend_ldap_uri ULTRAPOSSUM_CONFIG_BACKEND_LDAP_URI
+      setconfig_backend config_backend_ldap_basedn ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BASEDN
+      setconfig_backend config_backend_ldap_binddn ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDDN
+      setconfig_backend config_backend_ldap_bindpw ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDPW
+    ;;
+    *)
+      ultrapossum_setconf_shell /etc/ultrapossum/config.cf ULTRAPOSSUM_CONFIG_BACKEND ""
+      install -d /etc/ultrapossum/
+      ucf /usr/share/ultrapossum/ucf/ultrapossum/ultrapossum.cf \
+        /etc/ultrapossum/ultrapossum.cf
+    ;;
+  esac
+  eval `ultrapossum-config term`
+  )
+}
+
+
 case "$1" in
     configure)
 
@@ -58,27 +83,9 @@
 		ucf /usr/share/ultrapossum/ucf/ultrapossum/$f \
 			/etc/ultrapossum/$f
 	done
-	
-	eval `ultrapossum-config init`
-        db_get ultrapossum-common/config_backend
-	backend="$RET"
-        case "$backend" in
-          ldap)
-	    setconfig_backend config_backend ULTRAPOSSUM_CONFIG_BACKEND
-	    setconfig_backend config_backend_ldap_uri ULTRAPOSSUM_CONFIG_BACKEND_LDAP_URI
-	    setconfig_backend config_backend_ldap_basedn ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BASEDN
-	    setconfig_backend config_backend_ldap_binddn ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDDN
-	    setconfig_backend config_backend_ldap_bindpw ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDPW
-          ;;
-          *)
-            ultrapossum_setconf_shell /etc/ultrapossum/config.cf ULTRAPOSSUM_CONFIG_BACKEND ""
-	    install -d /etc/ultrapossum/
-	    ucf /usr/share/ultrapossum/ucf/ultrapossum/ultrapossum.cf \
-			/etc/ultrapossum/ultrapossum.cf
-          ;;
-        esac
-	eval `ultrapossum-config term`
 
+	set_config_backend
+	
         case "$backend" in
 	  ldap)
 	  ;;


From taru ¡÷ users.sourceforge.jp  Tue Sep 21 14:06:01 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 21 Sep 2004 14:06:01 +0900
Subject: [Ultrapossum-cvs 488] projects/yubin NONE, 1.1, ken_all.csv NONE, 1.1,
	yubin.rb
Message-ID: <20040921050601.511CF2AC02B@users.sourceforge.jp>



From taru ¡÷ users.sourceforge.jp  Tue Sep 21 14:06:02 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 21 Sep 2004 14:06:02 +0900
Subject: [Ultrapossum-cvs 489] projects/yubin/gui NONE, 1.1, gui.glade NONE,
	1.1, gui.gladep
Message-ID: <20040921050602.BA3142AC02B@users.sourceforge.jp>



From taru ¡÷ users.sourceforge.jp  Tue Sep 21 14:08:01 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 21 Sep 2004 14:08:01 +0900
Subject: [Ultrapossum-cvs 490] projects/yubin/gui NONE,1.1,yubin.rb
Message-ID: <20040921050801.1128C2AC02B@users.sourceforge.jp>



From taru ¡÷ users.sourceforge.jp  Tue Sep 21 15:07:02 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 21 Sep 2004 15:07:02 +0900
Subject: [Ultrapossum-cvs 491] projects/yubin/gui 1.1,1.2,yubin.rb
Message-ID: <20040921060702.B78EC2AC02B@users.sourceforge.jp>

===================================================================
RCS file: projects/yubin/gui/yubin.rb,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- projects/yubin/gui/yubin.rb	2004/09/21 05:08:01	1.1
+++ projects/yubin/gui/yubin.rb	2004/09/21 06:07:02	1.2
@@ -1,6 +1,7 @@
 #!/usr/bin/ruby
 
 require 'libglade2'
+require 'base64'
 
 class PostalFactory
 
@@ -10,8 +11,24 @@
   end
 
   def create( filter )
-   puts "ldapsearch -LLL -x -h #{@host} -b #{@base} #{filter}"
-   system("ldapsearch -LLL -x -h #{@host} -b #{@base} #{filter}")
+   puts "ldapsearch -LLL -x -h #{@host} -b #{@base} #{filter}" if $DEBUG
+   open("|ldapsearch -LLL -x -h #{@host} -b #{@base} #{filter}") { |io|
+     postalCode = nil
+     postalAddress = nil
+     io.each_line do |line|
+       puts line if $DEBUG
+       case line
+       when /o:: (.*)/
+         postalAddress = Base64::decode64($1)
+       when /postalCode: (.*)/
+         postalCode = $1
+       when /^$/
+         yield( postalCode, postalAddress )
+	 postalCode = postalAddress = nil
+       end
+     end
+     yield( postalCode, postalAddress ) if ! postalCode.nil?
+   }
   end
 
 end
@@ -25,6 +42,8 @@
     @widgets = widgets
     @postalfactory = postalfactory
     @list = Gtk::ListStore.new( String, String )
+    @row = {}
+    @visible = {}
     @columns = []
     Column.size.times do |i|
       @columns << Gtk::TreeViewColumn.new(Column[i], Gtk::CellRendererText.new, { :markup => i })
@@ -38,11 +57,31 @@
   def on_filterentry_changed
     key = @widgets["filterentry"].text
     if key != ""
+      visible = {}
       filter = "postalCode=#{key}*"
-      @postalfactory.create(filter)
+      @postalfactory.create(filter) do |code, addr|
+        puts "#{code}: #{addr}" if $DEBUG
+        if @row[addr].nil?
+	  @row[addr] = [ @list.append, code ]
+	end
+        visible[addr] = true
+      end
+      @row.each_key do |addr|
+        if visible[addr].nil?
+	  @list.remove( @row[addr][0] )
+          @row.delete( addr )
+	end
+      end
+      update
     end
   end
 
+  def update
+    @row.each_key do |addr|
+        @list.set_value(@row[addr][0], 0, @row[addr][1])
+        @list.set_value(@row[addr][0], 1, addr)
+    end
+  end
 
 end
 


From taru ¡÷ users.sourceforge.jp  Tue Sep 21 15:30:30 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 21 Sep 2004 15:30:30 +0900
Subject: [Ultrapossum-cvs 492] projects/yubin/gui 1.2,1.3,yubin.rb
Message-ID: <20040921063030.5B1B42AC02B@users.sourceforge.jp>

===================================================================
RCS file: projects/yubin/gui/yubin.rb,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- projects/yubin/gui/yubin.rb	2004/09/21 06:07:02	1.2
+++ projects/yubin/gui/yubin.rb	2004/09/21 06:30:30	1.3
@@ -10,22 +10,50 @@
     @base = base
   end
 
+  def each_entry( io )
+    buf = ""
+    io.each_line do |line|
+      case line
+      when /^$/
+        yield( buf )
+	buf = ""
+      else
+        buf << line
+      end
+    end
+    yield( buf ) if buf != ""
+  end
+
+  def each_attr( entry )
+    buf = ""
+    entry.each_line do |line|
+      case line
+      when /^ (.*)/
+        buf << line
+      else
+        yield( buf.delete(" \n") ) if buf != ""
+	buf = line
+      end
+    end
+    yield( buf.delete(" \n") ) if buf != ""
+  end
+
   def create( filter )
    puts "ldapsearch -LLL -x -h #{@host} -b #{@base} #{filter}" if $DEBUG
    open("|ldapsearch -LLL -x -h #{@host} -b #{@base} #{filter}") { |io|
      postalCode = nil
      postalAddress = nil
-     io.each_line do |line|
-       puts line if $DEBUG
-       case line
-       when /o:: (.*)/
-         postalAddress = Base64::decode64($1)
-       when /postalCode: (.*)/
-         postalCode = $1
-       when /^$/
-         yield( postalCode, postalAddress )
-	 postalCode = postalAddress = nil
+     each_entry(io) do |entry|
+       each_attr(entry) do |attr|
+         case attr
+         when /^o::(.*)$/
+           postalAddress = Base64::decode64($1)
+         when /postalCode:(.*)/
+           postalCode = $1
+         end
        end
+       yield( postalCode, postalAddress )
+       postalCode = postalAddress = nil
      end
      yield( postalCode, postalAddress ) if ! postalCode.nil?
    }


From taru ¡÷ users.sourceforge.jp  Tue Sep 21 15:33:02 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 21 Sep 2004 15:33:02 +0900
Subject: [Ultrapossum-cvs 493] projects/yubin/gui 1.3,1.4,yubin.rb
Message-ID: <20040921063302.0FC6C2AC02B@users.sourceforge.jp>

===================================================================
RCS file: projects/yubin/gui/yubin.rb,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- projects/yubin/gui/yubin.rb	2004/09/21 06:30:30	1.3
+++ projects/yubin/gui/yubin.rb	2004/09/21 06:33:02	1.4
@@ -106,7 +106,7 @@
 
   def update
     @row.each_key do |addr|
-        @list.set_value(@row[addr][0], 0, @row[addr][1])
+        @list.set_value(@row[addr][0], 0, "#{@row[addr][1][0..2]}-#{@row[addr][1][3..6]}")
         @list.set_value(@row[addr][0], 1, addr)
     end
   end


From taru ¡÷ users.sourceforge.jp  Tue Sep 21 15:34:26 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 21 Sep 2004 15:34:26 +0900
Subject: [Ultrapossum-cvs 494] projects/yubin/gui 1.4,1.5,yubin.rb
Message-ID: <20040921063426.1836C2AC02B@users.sourceforge.jp>

===================================================================
RCS file: projects/yubin/gui/yubin.rb,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- projects/yubin/gui/yubin.rb	2004/09/21 06:33:02	1.4
+++ projects/yubin/gui/yubin.rb	2004/09/21 06:34:26	1.5
@@ -83,7 +83,7 @@
   end
 
   def on_filterentry_changed
-    key = @widgets["filterentry"].text
+    key = @widgets["filterentry"].text.delete("-")
     if key != ""
       visible = {}
       filter = "postalCode=#{key}*"


From taru ¡÷ users.sourceforge.jp  Tue Sep 21 17:56:01 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 21 Sep 2004 17:56:01 +0900
Subject: [Ultrapossum-cvs 495] projects/yubin/gui 1.5,1.6,yubin.rb
Message-ID: <20040921085601.40B382AC02D@users.sourceforge.jp>

===================================================================
RCS file: projects/yubin/gui/yubin.rb,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- projects/yubin/gui/yubin.rb	2004/09/21 06:34:26	1.5
+++ projects/yubin/gui/yubin.rb	2004/09/21 08:56:01	1.6
@@ -39,11 +39,12 @@
   end
 
   def create( filter )
-   puts "ldapsearch -LLL -x -h #{@host} -b #{@base} #{filter}" if $DEBUG
+   $stderr.puts "ldapsearch -LLL -x -h #{@host} -b #{@base} #{filter}" if $DEBUG
    open("|ldapsearch -LLL -x -h #{@host} -b #{@base} #{filter}") { |io|
      postalCode = nil
      postalAddress = nil
      each_entry(io) do |entry|
+       $stderr.puts entry if $DEBUG
        each_attr(entry) do |attr|
          case attr
          when /^o::(.*)$/
@@ -84,11 +85,18 @@
 
   def on_filterentry_changed
     key = @widgets["filterentry"].text.delete("-")
-    if key != ""
+    filter = nil
+    case key
+    when /[0-9\-]+/
+      filter = "postalCode=#{key}*" if key.size > 1
+    else
+      filter = "st=*#{key}*" if key.size > 3
+    end
+    if ! filter.nil?
       visible = {}
-      filter = "postalCode=#{key}*"
       @postalfactory.create(filter) do |code, addr|
-        puts "#{code}: #{addr}" if $DEBUG
+        $stderr.puts "#{code}: #{addr}" if $DEBUG
+	$stderr.puts "postalCode not found for #{addr}" if code.nil?
         if @row[addr].nil?
 	  @row[addr] = [ @list.append, code ]
 	end


From taru ¡÷ users.sourceforge.jp  Tue Sep 21 18:32:01 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 21 Sep 2004 18:32:01 +0900
Subject: [Ultrapossum-cvs 496] projects/yubin/gui 1.1, 1.2, gui.glade 1.6, 1.7,
	yubin.rb
Message-ID: <20040921093201.5A81C2AC045@users.sourceforge.jp>

===================================================================
RCS file: projects/yubin/gui/gui.glade,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- projects/yubin/gui/gui.glade	2004/09/21 05:06:01	1.1
+++ projects/yubin/gui/gui.glade	2004/09/21 09:32:01	1.2
@@ -9,6 +9,8 @@
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
+  <property name="default_width">367</property>
+  <property name="default_height">324</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
   <property name="decorated">True</property>
===================================================================
RCS file: projects/yubin/gui/yubin.rb,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- projects/yubin/gui/yubin.rb	2004/09/21 08:56:01	1.6
+++ projects/yubin/gui/yubin.rb	2004/09/21 09:32:01	1.7
@@ -39,8 +39,8 @@
   end
 
   def create( filter )
-   $stderr.puts "ldapsearch -LLL -x -h #{@host} -b #{@base} #{filter}" if $DEBUG
-   open("|ldapsearch -LLL -x -h #{@host} -b #{@base} #{filter}") { |io|
+   $stderr.puts "ldapsearch -LLL -x -h #{@host} -b #{@base} '#{filter}'"
+   open("|ldapsearch -LLL -x -h #{@host} -b #{@base} '#{filter}'") { |io|
      postalCode = nil
      postalAddress = nil
      each_entry(io) do |entry|
@@ -90,7 +90,13 @@
     when /[0-9\-]+/
       filter = "postalCode=#{key}*" if key.size > 1
     else
-      filter = "st=*#{key}*" if key.size > 3
+      if key.size > 3
+        filter="(|(o=*#{key}*)(&"
+        key.split(" ").each do |k|
+          filter << "(st=*#{k}*)"
+	end
+	filter << "))"
+      end
     end
     if ! filter.nil?
       visible = {}


From taru ¡÷ users.sourceforge.jp  Tue Sep 21 18:32:18 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 21 Sep 2004 18:32:18 +0900
Subject: [Ultrapossum-cvs 497] projects/yubin/gui 1.7,1.8,yubin.rb
Message-ID: <20040921093218.839982AC02D@users.sourceforge.jp>

===================================================================
RCS file: projects/yubin/gui/yubin.rb,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- projects/yubin/gui/yubin.rb	2004/09/21 09:32:01	1.7
+++ projects/yubin/gui/yubin.rb	2004/09/21 09:32:18	1.8
@@ -39,7 +39,7 @@
   end
 
   def create( filter )
-   $stderr.puts "ldapsearch -LLL -x -h #{@host} -b #{@base} '#{filter}'"
+   $stderr.puts "ldapsearch -LLL -x -h #{@host} -b #{@base} '#{filter}'" if $DEBUG
    open("|ldapsearch -LLL -x -h #{@host} -b #{@base} '#{filter}'") { |io|
      postalCode = nil
      postalAddress = nil


From taru ¡÷ users.sourceforge.jp  Wed Sep 22 11:56:52 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 22 Sep 2004 11:56:52 +0900
Subject: [Ultrapossum-cvs 498] ultrapossum 1.19,1.20,ultrapossum-config.in
Message-ID: <20040922025652.108AB2AC055@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/ultrapossum-config.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ultrapossum/ultrapossum-config.in	2004/09/17 11:26:24	1.19
+++ ultrapossum/ultrapossum-config.in	2004/09/22 02:56:51	1.20
@@ -28,6 +28,8 @@
 localstatedir=${localstatedir:- ¡÷ localstatedir@}
 PACKAGE=${PACKAGE:- ¡÷ PACKAGE@}
 
+. $SHAREDIR/init.d/10compat
+
 case "x$1" in
     xinit)
         shift


From taru ¡÷ users.sourceforge.jp  Wed Sep 22 13:18:44 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 22 Sep 2004 13:18:44 +0900
Subject: [Ultrapossum-cvs 499] ultrapossum 1.1,1.2,ultrapossum-server.in
Message-ID: <20040922041844.93F672AC018@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/ultrapossum-server.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ultrapossum/ultrapossum-server.in	2004/06/01 05:40:19	1.1
+++ ultrapossum/ultrapossum-server.in	2004/09/22 04:18:44	1.2
@@ -6,7 +6,7 @@
 sbindir=@sbindir@
 pkgdatadir=@datadir@/@PACKAGE@
 
-export PATH=$bindir:$sbindir:$PATH
+PATH=$bindir:$sbindir:$PATH
+export PATH
 exec $pkgdatadir/module.d/server/startup "$@"
-
 


From taru ¡÷ users.sourceforge.jp  Wed Sep 22 13:19:37 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 22 Sep 2004 13:19:37 +0900
Subject: [Ultrapossum-cvs 500] ultrapossum/module/server 1.12,1.13,10server
Message-ID: <20040922041937.99CA22AC018@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/server/10server,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ultrapossum/module/server/10server	2004/09/17 12:10:11	1.12
+++ ultrapossum/module/server/10server	2004/09/22 04:19:37	1.13
@@ -204,7 +204,7 @@
   SLAPD_BACKEND_DB_TYPE=${val:-$SLAPD_DEFAULT_BACKEND_DB_TYPE}
 fi
 
-ULTRAPOSSUM_APPS=`find $APPSDIR -type f -maxdepth 1 | grep -v tmp | xargs -n1 basename 2> /dev/null || true`
+ULTRAPOSSUM_APPS=`find $APPSDIR -type f | grep -v tmp | xargs -n1 basename 2> /dev/null || true`
 ULTRAPOSSUM_INDEX=`egrep '^index' $ULTRAPOSSUM_MASTER_SLAPD_CONF 2> /dev/null | tr '\n' ' '`
 
 ULTRAPOSSUM_SLAPD_CONFIN=`ultrapossum_getconf ULTRAPOSSUM_SLAPD_CONFIN $TEMPLATEDIR/slapd-$SLAPD_BACKEND_DB_TYPE.conf.in`


From taru ¡÷ users.sourceforge.jp  Wed Sep 22 13:48:31 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 22 Sep 2004 13:48:31 +0900
Subject: [Ultrapossum-cvs 501] projects/yubin/gui 1.2, 1.3, gui.glade 1.8, 1.9,
	yubin.rb
Message-ID: <20040922044831.57C192AC053@users.sourceforge.jp>

===================================================================
RCS file: projects/yubin/gui/gui.glade,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- projects/yubin/gui/gui.glade	2004/09/21 09:32:01	1.2
+++ projects/yubin/gui/gui.glade	2004/09/22 04:48:31	1.3
@@ -26,25 +26,58 @@
       <property name="spacing">0</property>
 
       <child>
-	<widget class="GtkHBox" id="hbox1">
-	  <property name="border_width">8</property>
+	<widget class="GtkVBox" id="vbox1">
 	  <property name="visible">True</property>
 	  <property name="homogeneous">False</property>
 	  <property name="spacing">0</property>
 
 	  <child>
-	    <widget class="GtkLabel" id="label1">
+	    <widget class="GtkHBox" id="hbox1">
+	      <property name="border_width">8</property>
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Filter:</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">0</property>
+
+	      <child>
+		<widget class="GtkLabel" id="label1">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">Filter:</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkEntry" id="filterentry">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="editable">True</property>
+		  <property name="visibility">True</property>
+		  <property name="max_length">0</property>
+		  <property name="text" translatable="yes"></property>
+		  <property name="has_frame">True</property>
+		  <property name="invisible_char" translatable="yes">*</property>
+		  <property name="activates_default">False</property>
+		  <signal name="changed" handler="on_filterentry_changed" last_modification_time="Mon, 20 Sep 2004 11:39:44 GMT"/>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">True</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
@@ -54,17 +87,25 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkEntry" id="filterentry">
+	    <widget class="GtkScrolledWindow" id="scrolledwindow1">
+	      <property name="border_width">8</property>
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
-	      <property name="activates_default">False</property>
-	      <signal name="changed" handler="on_filterentry_changed" last_modification_time="Mon, 20 Sep 2004 11:39:44 GMT"/>
+	      <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
+	      <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+	      <property name="shadow_type">GTK_SHADOW_NONE</property>
+	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+	      <child>
+		<widget class="GtkTreeView" id="treeview1">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="headers_visible">True</property>
+		  <property name="rules_hint">True</property>
+		  <property name="reorderable">False</property>
+		  <property name="enable_search">True</property>
+		</widget>
+	      </child>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
@@ -72,10 +113,23 @@
 	      <property name="fill">True</property>
 	    </packing>
 	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
 
-	  <child>
-	    <placeholder/>
-	  </child>
+      <child>
+	<widget class="GtkButton" id="quit_button">
+	  <property name="visible">True</property>
+	  <property name="can_focus">True</property>
+	  <property name="label">gtk-quit</property>
+	  <property name="use_stock">True</property>
+	  <property name="relief">GTK_RELIEF_NORMAL</property>
+	  <property name="focus_on_click">True</property>
+	  <signal name="clicked" handler="on_quit_button_clicked" last_modification_time="Tue, 21 Sep 2004 13:15:13 GMT"/>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
@@ -85,30 +139,14 @@
       </child>
 
       <child>
-	<widget class="GtkScrolledWindow" id="scrolledwindow1">
-	  <property name="border_width">8</property>
+	<widget class="GtkStatusbar" id="statusbar1">
 	  <property name="visible">True</property>
-	  <property name="can_focus">True</property>
-	  <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-	  <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-	  <property name="shadow_type">GTK_SHADOW_NONE</property>
-	  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-	  <child>
-	    <widget class="GtkTreeView" id="treeview1">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="headers_visible">True</property>
-	      <property name="rules_hint">True</property>
-	      <property name="reorderable">False</property>
-	      <property name="enable_search">True</property>
-	    </widget>
-	  </child>
+	  <property name="has_resize_grip">True</property>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
+	  <property name="expand">False</property>
+	  <property name="fill">False</property>
 	</packing>
       </child>
     </widget>
===================================================================
RCS file: projects/yubin/gui/yubin.rb,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- projects/yubin/gui/yubin.rb	2004/09/21 09:32:18	1.8
+++ projects/yubin/gui/yubin.rb	2004/09/22 04:48:31	1.9
@@ -131,6 +131,10 @@
   $v.on_filterentry_changed
 end
 
+def on_quit_button_clicked
+  Gtk.main_quit
+end
+
 Gtk.init
 glade = GladeXML.new("gui.glade") {|handler| method(handler)}
 postalfactory = PostalFactory.new("localhost", "ou=yubin,o=ultrapossum")


From taru ¡÷ users.sourceforge.jp  Wed Sep 22 14:45:28 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 22 Sep 2004 14:45:28 +0900
Subject: [Ultrapossum-cvs 502] ultrapossum 1.42,1.43,configure.in
Message-ID: <20040922054528.E4B532AC017@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/configure.in,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ultrapossum/configure.in	2004/09/17 07:09:16	1.42
+++ ultrapossum/configure.in	2004/09/22 05:45:28	1.43
@@ -4,8 +4,8 @@
 # $Id$
 
 AC_PREREQ(2.50)
-AC_INIT(ultrapossum, 0.1beta9, taru ¡÷ ultrapossum.org)
-AM_INIT_AUTOMAKE(ultrapossum, 0.1beta9)
+AC_INIT(ultrapossum, 0.1beta10, taru ¡÷ ultrapossum.org)
+AM_INIT_AUTOMAKE(ultrapossum, 0.1beta10)
 
 # Checks for programs.
 AC_PROG_INSTALL


From taru ¡÷ users.sourceforge.jp  Wed Sep 22 14:50:53 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 22 Sep 2004 14:50:53 +0900
Subject: [Ultrapossum-cvs 503] ultrapossum 1.16,1.17,update-ultrapossum
Message-ID: <20040922055053.416252AC017@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/update-ultrapossum,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ultrapossum/update-ultrapossum	2004/09/07 10:30:45	1.16
+++ ultrapossum/update-ultrapossum	2004/09/22 05:50:53	1.17
@@ -78,7 +78,7 @@
   getconfig | grep -v SLAPROOTPW | grep -v CHROOTFILES > $conftemp
   # little evil
   if ! up_to_date ||
-  	diff -u $CONFSTATUS $conftemp | egrep "^\+[^+]" | cut -d+ -f2 | cut -d= -f1 | egrep . 1>&2
+  	diff -c $CONFSTATUS $conftemp | egrep "^\! [^+]" | cut -d' ' -f2- | cut -d= -f1 | sort | uniq | egrep . 1>&2
   then
     sanity_module
 


From taru ¡÷ users.sourceforge.jp  Wed Sep 22 14:52:02 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 22 Sep 2004 14:52:02 +0900
Subject: [Ultrapossum-cvs 504] ultrapossum/debian 1.54,1.55,changelog
Message-ID: <20040922055202.6717A2AC017@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/changelog,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- ultrapossum/debian/changelog	2004/09/21 04:43:22	1.54
+++ ultrapossum/debian/changelog	2004/09/22 05:52:02	1.55
@@ -1,3 +1,9 @@
+ultrapossum (0.1beta10-0pre1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Masato Taruishi <taru ¡÷ valinux.co.jp>  Wed, 22 Sep 2004 14:50:13 +0900
+
 ultrapossum (0.1beta9-0pre3) unstable; urgency=low
 
   * rootpw is now set in ultrapossum-common debconf, too.


From taru ¡÷ users.sourceforge.jp  Wed Sep 22 15:32:54 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 22 Sep 2004 15:32:54 +0900
Subject: [Ultrapossum-cvs 505] ultrapossum/module/server 1.21,1.22,2.0
Message-ID: <20040922063254.6C0192AC017@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/server/2.0,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ultrapossum/module/server/2.0	2004/09/11 02:37:53	1.21
+++ ultrapossum/module/server/2.0	2004/09/22 06:32:54	1.22
@@ -79,10 +79,8 @@
     if test "`ldapslurp_status`" = "running"; then
       sleep 1
       ldapslurp_stop
-    fi
-    if test "`$MODULEDIR/server/pid status $slurpdlogpid`" = "running"; then
-      $MODULEDIR/server/pid stop $slurpdlogpid
-      /bin/rm -f $slurpdlog
+      $MODULEDIR/server/pid stop $slurpdlogpid 2> /dev/null
+      /bin/rm -f $slurpdlogpid
     fi
 }
 


From taru ¡÷ users.sourceforge.jp  Wed Sep 22 15:38:57 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 22 Sep 2004 15:38:57 +0900
Subject: [Ultrapossum-cvs 506] ultrapossum/module/server 1.10,1.11,sshman
Message-ID: <20040922063857.0A02F2AC017@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/server/sshman,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ultrapossum/module/server/sshman	2004/09/17 12:43:08	1.10
+++ ultrapossum/module/server/sshman	2004/09/22 06:38:56	1.11
@@ -32,6 +32,7 @@
   echo "." 1>&2
   add_endmark "##" "SERVER" >> $tmp
   install -m700 -d $home/.ssh/
+  touch $home/.ssh/authorized_keys
   add_end_vaconf $home/.ssh/authorized_keys $tmp "SERVER"
 }
 


From taru ¡÷ users.sourceforge.jp  Wed Sep 22 16:06:04 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 22 Sep 2004 16:06:04 +0900
Subject: [Ultrapossum-cvs 507] web 1.34, 1.35, quickguide.html NONE, 1.1,
	quickguide_misc.html
Message-ID: <20040922070604.587442AC00E@users.sourceforge.jp>

===================================================================
RCS file: web/quickguide.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- web/quickguide.html	2004/09/17 06:45:35	1.34
+++ web/quickguide.html	2004/09/22 07:06:04	1.35
@@ -1,43 +1,44 @@
-<html lang="ja">
-<head>
+<html lang="ja"><head><title>UltraPossum: ¥¯¥¤¥Ã¥¯¥¬¥¤¥É</title>
 
-<title>UltraPossum: ¥¯¥¤¥Ã¥¯¥¬¥¤¥É </title>
-<link rel="shortcut icon" href="/favicon.ico">
+
+<link rel="shortcut icon" href="http://ultrapossum.org/favicon.ico">
 <meta name="description" content="UltraPossum: High Availability Directory Solut
 ion for Linux">
 <meta name="keywords" content="Verge, High Availability, Directory, UltraPossum,
  Ultra, Possum, LDAP">
 <meta http-equiv="Content-Type" content="text/html; charset=euc-jp">
 <meta name="Content-Language" content="ja">
-<link rel="stylesheet" href="ultrapossum.css" type="text/css">
-</head>
-
+<link rel="stylesheet" href="quickguide_files/ultrapossum.css" type="text/css"></head>
 <body>
 
-<table border="0" width=100%>
+<table border="0" width="100%">
 <tbody>
 <tr>
-</td>
-<td><img src="pics/uplogo4.png">
+
+<td><img src="quickguide_files/uplogo4.png">
 </td>
 <td>
-<a href="/"><img src="pics/possumx2.gif" 
- alt="[Possum]" width=100 height=100 align=right  border=0></a>
-</tr>
+<a href="http://ultrapossum.org/"><img src="quickguide_files/possumx2.gif" alt="[Possum]" width="100" height="100" align="right" border="0"></a>
+</td></tr>
 </tbody>
 </table>
 
-    [<a href="/">¥È¥Ã¥×</a>][<a href="faq.html">FAQ</a>][<a href="screenshots.html">¥¹¥¯¥ê¡¼¥ó¥·¥ç¥Ã¥È</a>][<a href="demo.html">¹½À®Îã</a>][¥¯¥¤¥Ã¥¯¥¬¥¤¥É]
-
+    [<a href="http://ultrapossum.org/">¥È¥Ã¥×</a>][<a href="http://ultrapossum.org/faq.html">FAQ</a>][<a href="http://ultrapossum.org/screenshots.html">¥¹¥¯¥ê¡¼¥ó¥·¥ç¥Ã¥È</a>][<a href="http://ultrapossum.org/demo.html">¹½À®Îã</a>][¥¯¥¤¥Ã¥¯¥¬¥¤¥É]
+<br>
+    [Debian][<a href="http://ultrapossum.org/quickguide_misc.html">¤½¤Î¾</a>]
 <h1>UltraPossum ¥¯¥¤¥Ã¥¯¥¬¥¤¥É for Debian</h1>
 
-    <p>
-      ¤³¤Î¥¬¥¤¥É¤Ï UltraPossum ¤ò Debian ¾å¤ÇÍøÍѤ¹¤ë¤¿¤á¤Î¼ê°ú¤Ç¤¹¡£Debian ¥Ä¡¼¥ë¤ÎÍøÍѤò²¾Äꤷ¤¿µ­½Ò¤¬¤¤¤¯¤Ä¤«¸«¤é¤ì¤Þ¤¹¤¬¡¢Â¾¤Î¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤ò¤ª»È¤¤¤ÎÊý¤ÏŬµ¹Æɤߤ«¤¨¤Æ UltraPossum ƳÆþ¤Îή¤ì¤ò¤Ä¤«¤ó¤Ç¤¯¤À¤µ¤¤¡£
-    </p>
-
-    <p>
-      Ëܼê°ú¤Ç¤Ï UltraPossum ¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤«¤é UltraPossum Âбþ¥Ä¡¼¥ë¤Ç¤¢¤ë ultramigration ¤ò»È¤Ã¤Æ¡¢LDAP ¥Ç¥£¥ì¥¯¥È¥ê¤Ë /etc/passwd ¤Î¥æ¡¼¥¶¾ðÊó¤ò½ñ¤­¹þ¤ß¤Þ¤¹¡£¤½¤Î¸å ultramigration ¤Î¼Â¹Ô¤Ë¤è¤Ã¤ÆÊѹ¹¤µ¤ì¤¿ LDAP ¥Ç¥£¥ì¥¯¥È¥ê¤ò½é´ü²½¤·¤Æ¡¢UltraPossum ¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¾õÂ֤˥ǥ£¥ì¥¯¥È¥ê¤òÌᤷ¤Þ¤¹¡£ºÇ¸å¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¢¤ë UltraPossum ¼«ÂΤòºï½ü¤·¤Þ¤¹¡£ºï½ü¤ò¹Ô¤¦¤È UltraPossum ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÁ°¤Î¾õÂÖ¤ËÌá¤ê¤Þ¤¹(UltraPossum ¤Î°Í¸´Ø·¸¤Ë¤è¤Ã¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸¤Ïºï½ü¤µ¤ì¤Þ¤»¤ó)¡£
-    </p>
+    <p> ¤³¤Î¥¬¥¤¥É¤Ï UltraPossum ¤ò
+Debian ¾å¤ÇÍøÍѤ¹¤ë¤¿¤á¤Î¼ê°ú¤Ç¤¹¡£Debian
+¥Ä¡¼¥ë¤ÎÍøÍѤò²¾Äꤷ¤¿µ­½Ò¤¬¤¤¤¯¤Ä¤«¸«¤é¤ì¤Þ¤¹¤¬¡¢Â¾¤Î¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤ò¤ª»È¤¤¤ÎÊý¤ÏŬµ¹Æɤߤ«¤¨¤Æ UltraPossum
+ƳÆþ¤Îή¤ì¤ò¤Ä¤«¤ó¤Ç¤¯¤À¤µ¤¤¡£ </p>
+
+    <p> Ëܼê°ú¤Ç¤Ï UltraPossum ¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤«¤é UltraPossum
+Âбþ¥Ä¡¼¥ë¤Ç¤¢¤ë ultramigration ¤ò»È¤Ã¤Æ¡¢LDAP ¥Ç¥£¥ì¥¯¥È¥ê¤Ë /etc/passwd ¤Î¥æ¡¼¥¶¾ðÊó¤ò½ñ¤­¹þ¤ß¤Þ¤¹¡£¤½¤Î¸å
+ultramigration ¤Î¼Â¹Ô¤Ë¤è¤Ã¤ÆÊѹ¹¤µ¤ì¤¿ LDAP ¥Ç¥£¥ì¥¯¥È¥ê¤ò½é´ü²½¤·¤Æ¡¢UltraPossum
+¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¾õÂ֤˥ǥ£¥ì¥¯¥È¥ê¤òÌᤷ¤Þ¤¹¡£ºÇ¸å¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¢¤ë UltraPossum ¼«ÂΤòºï½ü¤·¤Þ¤¹¡£ºï½ü¤ò¹Ô¤¦¤È
+UltraPossum ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÁ°¤Î¾õÂÖ¤ËÌá¤ê¤Þ¤¹(UltraPossum
+¤Î°Í¸´Ø·¸¤Ë¤è¤Ã¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸¤Ïºï½ü¤µ¤ì¤Þ¤»¤ó)¡£ </p>
 
     <h2>ɬÍפʤâ¤Î</h2>
     ÆäËÁ°¤â¤Ã¤Æ½àÈ÷¤¹¤ë¤â¤Î¤Ï¤¢¤ê¤Þ¤»¤ó¡£Debian 3.0 (woody) °Ê¹ß¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£
@@ -45,15 +46,13 @@
     <h2>¥¤¥ó¥¹¥È¡¼¥ë</h2>
 
     °Ê²¼¤ÎÀßÄê¤ò <pre>  /etc/apt/sources.list</pre> ¤ËÄɲä·¤Þ¤¹¡£
-    <pre>
-  deb http://ultrapossum.org/debian/ ./
+    <pre>  deb http://ultrapossum.org/debian/ ./
     </pre>
 
 
     ³¤¤¤Æ apt-get update ¤ò¼Â¹Ô¤·¡¢apt-get ¤Ç ultrapossum ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£
 
-    <pre>
-~$ su -c "apt-get update"
+    <pre>~$ su -c "apt-get update"
 ~$ su -c "apt-get install ultrapossum"
 ...
 
@@ -81,28 +80,27 @@
 
     <h3>Debian woody</h3>
     <p>
-      Debian woody ¤Ë¤Ï ldapdiff ¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤»¤ó¡£¥Ð¥Ã¥¯¥Ý¡¼¥È¤·¤Æ¤â¹½¤¤¤Þ¤»¤ó¤¬ cdbs Åù¤ò»È¤Ã¤Æ¤¤¤ë´Ø·¸¤Ç¥Ð¥Ã¥¯¥Ý¡¼¥È¤¬ÌÌÅݤǤ¹¡£(¤³¤ì¤Ï¥¯¥¤¥Ã¥¯¥¬¥¤¥É¤Ç¤¹¤«¤é) ldapdiff ¤Î¤¢¤ë¥µ¥¤¥È¤«¤é¥½¡¼¥¹¤ò»ý¤Ã¤Æ¤­¤Æ /usr/local/ ¤ËÆþ¤ì¤Æ¤·¤Þ¤¤¤Þ¤·¤ç¤¦¡£<a href="http://webtomware.rhoen.de/">¤³¤³</a>¤«¤é¥½¡¼¥¹¤ò»ý¤Ã¤Æ¤­¤Æ°Ê²¼¤Î¤è¤¦¤Ë¼Â¹Ô¤·¤Þ¤¹¡£
+Debian woody ¤Ë¤Ï ldapdiff ¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤»¤ó¡£¥Ð¥Ã¥¯¥Ý¡¼¥È¤·¤Æ¤â¹½¤¤¤Þ¤»¤ó¤¬ cdbs
+Åù¤ò»È¤Ã¤Æ¤¤¤ë´Ø·¸¤Ç¥Ð¥Ã¥¯¥Ý¡¼¥È¤¬ÌÌÅݤǤ¹¡£(¤³¤ì¤Ï¥¯¥¤¥Ã¥¯¥¬¥¤¥É¤Ç¤¹¤«¤é) ldapdiff ¤Î¤¢¤ë¥µ¥¤¥È¤«¤é¥½¡¼¥¹¤ò»ý¤Ã¤Æ¤­¤Æ
+/usr/local/ ¤ËÆþ¤ì¤Æ¤·¤Þ¤¤¤Þ¤·¤ç¤¦¡£<a href="http://webtomware.rhoen.de/">¤³¤³</a>¤«¤é¥½¡¼¥¹¤ò»ý¤Ã¤Æ¤­¤Æ°Ê²¼¤Î¤è¤¦¤Ë¼Â¹Ô¤·¤Þ¤¹¡£
 
-      <pre>
- ~$ wget http://webtomware.rhoen.de/ldapdiff-1.0.0.tar.gz
+      </p><pre> ~$ wget http://webtomware.rhoen.de/ldapdiff-1.0.0.tar.gz
  ~$ tar zxf ldapdiff-1.0.0.tar.gz
  ~$ cd ldapdiff-1.0.0
  ~/ldapdiff-1.0.0$ ./configure
- ~/ldapdiff-1.0.0$ su -c "make install"</pre></p>
+ ~/ldapdiff-1.0.0$ su -c "make install"</pre><p></p>
       migrationtools ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤¬ÍøÍѤǤ­¤Þ¤¹¡£
 
       <pre>~$ su -c "apt-get install migrationtools"</pre>
 
     <h3>ultarmigration ¤Î¼Â¹Ô</h3>
     ultramigration ¤Ï¸½ºß ultrapossum-common ¥Ñ¥Ã¥±¡¼¥¸¤Î examples ¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤ËÃÖ¤¤¤Æ¤¢¤ê¤Þ¤¹¡£
-    <pre>
- ~$ su -c "/usr/share/doc/ultrapossum-common/examples/tools/ultramigration"
+    <pre> ~$ su -c "/usr/share/doc/ultrapossum-common/examples/tools/ultramigration"
     </pre>
 
     password ¤òÊѹ¹¤·¤Æ LDAP ¥¨¥ó¥È¥ê¤âÄɽ¾¤µ¤»¤Þ¤¹¡£
 
-    <pre>
- ~$ passwd
+    <pre> ~$ passwd
  Changing password for taru
  (current) UNIX password: 
  Enter new UNIX password: 
@@ -114,10 +112,10 @@
 
 
     <h2>¥Ç¥£¥ì¥¯¥È¥ê¤Î¥Õ¥©¡¼¥Þ¥Ã¥È</h2>
-    ultramigration ¤ò¼Â¹Ô¤¹¤ë¤È¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï /etc/passwd ¤ÎÁ´¥æ¡¼¥¶¤¬¥Ç¥£¥ì¥¯¥È¥ê¤ËÄɲ䵤ì¤Þ¤¹¤¬¡¢¤³¤ì¤Ï /etc/migrationtools/migrate_common.ph ¤òÊÔ½¸¤¹¤ë¤³¤È¤ÇÊѹ¹¤Ç¤­¤Þ¤¹¡£¤³¤ì¤Ï migrationtolols ¤Î»È¤¤Êý¤ÎÏäǤ¹¤Ç¤Î¤³¤³¤Ç¤Ï³ä°¦¤·¡¢°Õ¿Þ¤·¤Ê¤¤¥æ¡¼¥¶¥¨¥ó¥È¥ê¤¬Äɲ䵤ì¤Æ¥Ç¥£¥ì¥¯¥È¥ê¤¬±ø¤ì¤Æ¤·¤Þ¤Ã¤¿¤È¤¤¤¦Ê̤κ¬ËÜŪ¤ÊÌäÂê¤ò²ò·è¤·¤Þ¤¹¡£
-
-    <pre>
- ~$ su -c "/etc/init.d/ultrapossum-server stop"
+ultramigration ¤ò¼Â¹Ô¤¹¤ë¤È¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï /etc/passwd ¤ÎÁ´¥æ¡¼¥¶¤¬¥Ç¥£¥ì¥¯¥È¥ê¤ËÄɲ䵤ì¤Þ¤¹¤¬¡¢¤³¤ì¤Ï
+/etc/migrationtools/migrate_common.ph ¤òÊÔ½¸¤¹¤ë¤³¤È¤ÇÊѹ¹¤Ç¤­¤Þ¤¹¡£¤³¤ì¤Ï
+migrationtolols
+¤Î»È¤¤Êý¤ÎÏäǤ¹¤Ç¤Î¤³¤³¤Ç¤Ï³ä°¦¤·¡¢°Õ¿Þ¤·¤Ê¤¤¥æ¡¼¥¶¥¨¥ó¥È¥ê¤¬Äɲ䵤ì¤Æ¥Ç¥£¥ì¥¯¥È¥ê¤¬±ø¤ì¤Æ¤·¤Þ¤Ã¤¿¤È¤¤¤¦Ê̤κ¬ËÜŪ¤ÊÌäÂê¤ò²ò·è¤·¤Þ¤¹¡£  <pre> ~$ su -c "/etc/init.d/ultrapossum-server stop"
  ~$ su -c "/usr/share/ultrapossum/module.d/server/formatdb.sh"
  ~$ su -c "/etc/init.d/ultrapossum-server start"
     </pre>
@@ -126,8 +124,7 @@
 
     <h2>Á´¤Æ¾Ã¤¹</h2>
     ÉÔÍפÀ¤È»×¤Ã¤¿¤é apt-get ¤òÍøÍѤ·¤Æ UltraPossum ¤ò´Êñ¤Ë¾Ã¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    <pre>
-~$ su -c "apt-get --purge remove ultrapossum-common"
+    <pre>~$ su -c "apt-get --purge remove ultrapossum-common"
 ~$ su -c "rm -rf /var/lib/ultrapossum/db"
     </pre>
 
@@ -140,31 +137,30 @@
 
     <h2>¤½¤Î¾</h2>
     <h3>UltraPossum ¤Î¥«¥¹¥¿¥Þ¥¤¥º</h3>
-    ¼«Ê¬¤·¤«¤½¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ò»È¤ï¤Ê¤¤¤Î¤Ç¤¢¤ì¤ÐÀßÄê¤Ï¤Ê¤Ë¤â¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤»¤ó¡£¤¿¤À¤·¡¢Í×µá¤Ë¤è¤Ã¤Æ¥«¥¹¥¿¥Þ¥¤¥º¤ò¤·¤¿¤¤¤³¤È¤â¤¢¤ê¤Þ¤¹¡£¤½¤Î»þ¤Ï debconf ¤ò»È¤Ã¤ÆºÆÀßÄê¤Ç¤­¤Þ¤¹¡£¤Ê¤ª¡¢debconf ¤ò»È¤ï¤º¤ËÀßÄê¥Õ¥¡¥¤¥ë¤òľÀܼê¤ÇÈ¿±Ç¤·¤Æ¤â¹½¤¤¤Þ¤»¤ó¡£debconf ¥Õ¥í¥ó¥È¥¨¥ó¥É¤ÏÀßÄê¥Õ¥¡¥¤¥ë¤ÎÊѹ¹¤Ë¼«Æ°¤ÇÄɽ¾¤·¤Þ¤¹(Àµ³Î¤Ë¸À¤¦¤È debconf ¥Õ¥í¥ó¥È¥¨¥ó¥É¤¬ÍøÍѤ·¤Æ¤¤¤ë UltraPossum ÀßÄê¥Õ¥ì¡¼¥à¥ï¡¼¥¯¤¬Äɽ¾¤·¤Þ¤¹)¡£ÀßÄê¥Õ¥¡¥¤¥ë¤Ï /etc/ultrapossum/ °Ê²¼¤Ë¤¢¤ê¤Þ¤¹¡£
-
-    <pre>
- ~$ su -c "dpkg-reconfigure -plow ultrapossum-server"
+¼«Ê¬¤·¤«¤½¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ò»È¤ï¤Ê¤¤¤Î¤Ç¤¢¤ì¤ÐÀßÄê¤Ï¤Ê¤Ë¤â¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤»¤ó¡£¤¿¤À¤·¡¢Í×µá¤Ë¤è¤Ã¤Æ¥«¥¹¥¿¥Þ¥¤¥º¤ò¤·¤¿¤¤¤³¤È¤â¤¢¤ê¤Þ¤¹¡£¤½¤Î»þ¤Ï
+debconf ¤ò»È¤Ã¤ÆºÆÀßÄê¤Ç¤­¤Þ¤¹¡£¤Ê¤ª¡¢debconf ¤ò»È¤ï¤º¤ËÀßÄê¥Õ¥¡¥¤¥ë¤òľÀܼê¤ÇÈ¿±Ç¤·¤Æ¤â¹½¤¤¤Þ¤»¤ó¡£debconf
+¥Õ¥í¥ó¥È¥¨¥ó¥É¤ÏÀßÄê¥Õ¥¡¥¤¥ë¤ÎÊѹ¹¤Ë¼«Æ°¤ÇÄɽ¾¤·¤Þ¤¹(Àµ³Î¤Ë¸À¤¦¤È debconf ¥Õ¥í¥ó¥È¥¨¥ó¥É¤¬ÍøÍѤ·¤Æ¤¤¤ë UltraPossum
+ÀßÄê¥Õ¥ì¡¼¥à¥ï¡¼¥¯¤¬Äɽ¾¤·¤Þ¤¹)¡£ÀßÄê¥Õ¥¡¥¤¥ë¤Ï /etc/ultrapossum/ °Ê²¼¤Ë¤¢¤ê¤Þ¤¹¡£ <pre> ~$ su -c "dpkg-reconfigure -plow ultrapossum-server"
     </pre>
 
-    <img src="pics/debconf1.ja.png" width=500>
+    <img src="quickguide_files/debconf1.png" width="500">
 
       <p>
 
     ºÙ¤«¤¤ÀßÄê¤ò³ä°¦¤·¤¿¤¤¾ì¹ç¤Ï debconf ¤ÎÍ¥ÀèÅÙ¤òÊѤ¨¤ë»ö¤ÇÂбþ¤Ç¤­¤Þ¤¹¡£
 
-    <pre>
- ~$ su -c "dpkg-reconfigure -pmedim ultrapossum-server"
+    </p><pre> ~$ su -c "dpkg-reconfigure -pmedim ultrapossum-server"
     </pre>
 
-    <img src="pics/debconf2.ja.png" width=500>
+    <img src="quickguide_files/debconf2.png" width="500">
 
 
 <br>
 
-<font size=1>
+<font size="1">
 
-<p>
-Copyright &copy; 2004, 
+</font><p>
+<font size="1">Copyright �¢í 2004, 
 <a href="http://www.valinux.co.jp/">VA Linux Systems Japan K.K.</a><br>
 <br><br>
 OpenLDAP is a registered trademark of OpenLDAP Foundation.
@@ -172,13 +168,12 @@
 Linux is a registered trademark of Linus Torvalds. <br>
 All other trademarks are the property of their respective owners. 
 <br>
-<pre>$Id$</pre>
-ËÜ¥½¥Õ¥È¥¦¥§¥¢¤Ï¸½ºß <a href="http://sourceforge.jp/">SourceForge.JP</a>¾å¤Ë¤Æ Web ¥Û¥¹¥Æ¥£¥ó¥°¤ª¤è¤Ó<a href="http://sourceforge.jp/projects/ultrapossum/">³«È¯</a>¤ò¹Ô¤Ã¤Æ¤¤¤Þ¤¹¡£
+</font></p><pre><font size="1">$Id$</font></pre>
+<font size="1">ËÜ¥½¥Õ¥È¥¦¥§¥¢¤Ï¸½ºß <a href="http://sourceforge.jp/">SourceForge.JP</a>¾å¤Ë¤Æ Web ¥Û¥¹¥Æ¥£¥ó¥°¤ª¤è¤Ó<a href="http://sourceforge.jp/projects/ultrapossum/">³«È¯</a>¤ò¹Ô¤Ã¤Æ¤¤¤Þ¤¹¡£
 </font>
 <p>
-<a href="http://sourceforge.jp/"><img src="http://sourceforge.jp/sflogo.php?group_id=1045" width="96" height="31" border="0" alt="SourceForge.jp"></a>
-<a href="http://www.ultrapossum.org/"><img src="http://www.ultrapossum.org/pics/upbt001.gif" width="96" height="31" border="0" alt="UltraPossum"></a> 
+<a href="http://sourceforge.jp/"><img src="quickguide_files/sflogo.png" width="96" height="31" border="0" alt="SourceForge.jp"></a>
+<a href="http://www.ultrapossum.org/"><img src="quickguide_files/upbt001.gif" width="96" height="31" border="0" alt="UltraPossum"></a> 
 </p>
 
-</body>
-</html>
+</body></html>


From taru ¡÷ users.sourceforge.jp  Wed Sep 22 16:07:21 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 22 Sep 2004 16:07:21 +0900
Subject: [Ultrapossum-cvs 508] web 1.1,1.2,quickguide_misc.html
Message-ID: <20040922070721.4133F2AC00E@users.sourceforge.jp>

===================================================================
RCS file: web/quickguide_misc.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- web/quickguide_misc.html	2004/09/22 07:06:04	1.1
+++ web/quickguide_misc.html	2004/09/22 07:07:21	1.2
@@ -8,17 +8,17 @@
  Ultra, Possum, LDAP">
 <meta http-equiv="Content-Type" content="text/html; charset=euc-jp">
 <meta name="Content-Language" content="ja">
-<link rel="stylesheet" href="quickguide_files/ultrapossum.css" type="text/css"></head>
+<link rel="stylesheet" href="ultrapossum.css" type="text/css"></head>
 <body>
 
 <table border="0" width="100%">
 <tbody>
 <tr>
 
-<td><img src="quickguide_files/uplogo4.png">
+<td><img src="pics/uplogo4.png">
 </td>
 <td>
-<a href="http://ultrapossum.org/"><img src="quickguide_files/possumx2.gif" alt="[Possum]" width="100" height="100" align="right" border="0"></a>
+<a href="http://ultrapossum.org/"><img src="pics/possumx2.gif" alt="[Possum]" width="100" height="100" align="right" border="0"></a>
 </td></tr>
 </tbody>
 </table>
@@ -105,8 +105,8 @@
 <font size="1">ËÜ¥½¥Õ¥È¥¦¥§¥¢¤Ï¸½ºß <a href="http://sourceforge.jp/">SourceForge.JP</a>¾å¤Ë¤Æ Web ¥Û¥¹¥Æ¥£¥ó¥°¤ª¤è¤Ó<a href="http://sourceforge.jp/projects/ultrapossum/">³«È¯</a>¤ò¹Ô¤Ã¤Æ¤¤¤Þ¤¹¡£
 </font>
 <p>
-<a href="http://sourceforge.jp/"><img src="quickguide_files/sflogo.png" width="96" height="31" border="0" alt="SourceForge.jp"></a>
-<a href="http://www.ultrapossum.org/"><img src="quickguide_files/upbt001.gif" width="96" height="31" border="0" alt="UltraPossum"></a> 
+<a href="http://sourceforge.jp/"><img src="pics/sflogo.png" width="96" height="31" border="0" alt="SourceForge.jp"></a>
+<a href="http://www.ultrapossum.org/"><img src="pics/upbt001.gif" width="96" height="31" border="0" alt="UltraPossum"></a> 
 </p>
 
 </body></html>


From taru ¡÷ users.sourceforge.jp  Wed Sep 22 16:07:49 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 22 Sep 2004 16:07:49 +0900
Subject: [Ultrapossum-cvs 509] web 1.35,1.36,quickguide.html
Message-ID: <20040922070749.400D62AC00E@users.sourceforge.jp>

===================================================================
RCS file: web/quickguide.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- web/quickguide.html	2004/09/22 07:06:04	1.35
+++ web/quickguide.html	2004/09/22 07:07:49	1.36
@@ -8,17 +8,17 @@
  Ultra, Possum, LDAP">
 <meta http-equiv="Content-Type" content="text/html; charset=euc-jp">
 <meta name="Content-Language" content="ja">
-<link rel="stylesheet" href="quickguide_files/ultrapossum.css" type="text/css"></head>
+<link rel="stylesheet" href="ultrapossum.css" type="text/css"></head>
 <body>
 
 <table border="0" width="100%">
 <tbody>
 <tr>
 
-<td><img src="quickguide_files/uplogo4.png">
+<td><img src="pics/uplogo4.png">
 </td>
 <td>
-<a href="http://ultrapossum.org/"><img src="quickguide_files/possumx2.gif" alt="[Possum]" width="100" height="100" align="right" border="0"></a>
+<a href="http://ultrapossum.org/"><img src="pics/possumx2.gif" alt="[Possum]" width="100" height="100" align="right" border="0"></a>
 </td></tr>
 </tbody>
 </table>
@@ -143,7 +143,7 @@
 ÀßÄê¥Õ¥ì¡¼¥à¥ï¡¼¥¯¤¬Äɽ¾¤·¤Þ¤¹)¡£ÀßÄê¥Õ¥¡¥¤¥ë¤Ï /etc/ultrapossum/ °Ê²¼¤Ë¤¢¤ê¤Þ¤¹¡£ <pre> ~$ su -c "dpkg-reconfigure -plow ultrapossum-server"
     </pre>
 
-    <img src="quickguide_files/debconf1.png" width="500">
+    <img src="pics/debconf1.png" width="500">
 
       <p>
 
@@ -152,7 +152,7 @@
     </p><pre> ~$ su -c "dpkg-reconfigure -pmedim ultrapossum-server"
     </pre>
 
-    <img src="quickguide_files/debconf2.png" width="500">
+    <img src="pics/debconf2.png" width="500">
 
 
 <br>
@@ -172,8 +172,8 @@
 <font size="1">ËÜ¥½¥Õ¥È¥¦¥§¥¢¤Ï¸½ºß <a href="http://sourceforge.jp/">SourceForge.JP</a>¾å¤Ë¤Æ Web ¥Û¥¹¥Æ¥£¥ó¥°¤ª¤è¤Ó<a href="http://sourceforge.jp/projects/ultrapossum/">³«È¯</a>¤ò¹Ô¤Ã¤Æ¤¤¤Þ¤¹¡£
 </font>
 <p>
-<a href="http://sourceforge.jp/"><img src="quickguide_files/sflogo.png" width="96" height="31" border="0" alt="SourceForge.jp"></a>
-<a href="http://www.ultrapossum.org/"><img src="quickguide_files/upbt001.gif" width="96" height="31" border="0" alt="UltraPossum"></a> 
+<a href="http://sourceforge.jp/"><img src="pics/sflogo.png" width="96" height="31" border="0" alt="SourceForge.jp"></a>
+<a href="http://www.ultrapossum.org/"><img src="pics/upbt001.gif" width="96" height="31" border="0" alt="UltraPossum"></a> 
 </p>
 
 </body></html>


From taru ¡÷ users.sourceforge.jp  Wed Sep 22 16:08:12 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 22 Sep 2004 16:08:12 +0900
Subject: [Ultrapossum-cvs 510] web 1.2,1.3,quickguide_misc.html
Message-ID: <20040922070812.89F452AC00E@users.sourceforge.jp>

===================================================================
RCS file: web/quickguide_misc.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- web/quickguide_misc.html	2004/09/22 07:07:21	1.2
+++ web/quickguide_misc.html	2004/09/22 07:08:12	1.3
@@ -27,7 +27,7 @@
 <br>
     [<a href="http://ultrapossum.org/quickguide.html">Debian</a>][¤½¤Î¾]
 
-<h1>UltraPossum ¥¯¥¤¥Ã¥¯¥¬¥¤¥É for Build</h1>
+<h1>UltraPossum ¥¯¥¤¥Ã¥¯¥¬¥¤¥É</h1>
 
     <p> ¤³¤Î¥¬¥¤¥É¤Ï UltraPossum¤òtarball¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤·¡¢
 OpenLDAP¤Î¥Ç¡¼¥¿¥ì¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¹Ô¤¦¤¿¤á¤Î¤Î¼ê°ú¤Ç¤¹¡£<br>


From taru ¡÷ users.sourceforge.jp  Wed Sep 22 18:11:16 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 22 Sep 2004 18:11:16 +0900
Subject: [Ultrapossum-cvs 511] web 1.36,1.37,quickguide.html
Message-ID: <20040922091116.4A9982AC068@users.sourceforge.jp>

===================================================================
RCS file: web/quickguide.html,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- web/quickguide.html	2004/09/22 07:07:49	1.36
+++ web/quickguide.html	2004/09/22 09:11:16	1.37
@@ -143,7 +143,7 @@
 ÀßÄê¥Õ¥ì¡¼¥à¥ï¡¼¥¯¤¬Äɽ¾¤·¤Þ¤¹)¡£ÀßÄê¥Õ¥¡¥¤¥ë¤Ï /etc/ultrapossum/ °Ê²¼¤Ë¤¢¤ê¤Þ¤¹¡£ <pre> ~$ su -c "dpkg-reconfigure -plow ultrapossum-server"
     </pre>
 
-    <img src="pics/debconf1.png" width="500">
+    <img src="pics/debconf1.ja.png" width="500">
 
       <p>
 
@@ -152,7 +152,7 @@
     </p><pre> ~$ su -c "dpkg-reconfigure -pmedim ultrapossum-server"
     </pre>
 
-    <img src="pics/debconf2.png" width="500">
+    <img src="pics/debconf2.ja.png" width="500">
 
 
 <br>


From taru ¡÷ users.sourceforge.jp  Wed Sep 22 19:16:40 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 22 Sep 2004 19:16:40 +0900
Subject: [Ultrapossum-cvs 512] ultrapossum/module/server 1.8, 1.9,
	formatdb.sh 1.13, 1.14, startup
Message-ID: <20040922101640.B91DB2AC03D@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/server/formatdb.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ultrapossum/module/server/formatdb.sh	2004/06/17 05:27:43	1.8
+++ ultrapossum/module/server/formatdb.sh	2004/09/22 10:16:40	1.9
@@ -36,7 +36,7 @@
 fi
 
 /bin/rm -rf $DIRECTORY $CONFSTATUS $CHROOTDIRECTORY$DIRECTORY
-update-ultrapossum configure
+$exec_prefix/sbin/update-ultrapossum configure
 
 if test "x$status" = "xstarted"; then
     $MODULEDIR/server/startup start 1>&2
===================================================================
RCS file: ultrapossum/module/server/startup,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ultrapossum/module/server/startup	2004/07/09 07:47:36	1.13
+++ ultrapossum/module/server/startup	2004/09/22 10:16:40	1.14
@@ -26,7 +26,7 @@
   if test "x$ULTRAPOSSUM_MODULE_SERVER" != "xinstalled"; then
     $UPDATEDIR/update-server configure
   fi
-  update-ultrapossum reconfigure
+  $exec_prefix/sbin/update-ultrapossum reconfigure
   if test "x$CHROOTDIRECTORY" != "x"; then
     setup_chroot_env
   fi


From taru ¡÷ users.sourceforge.jp  Wed Sep 22 19:17:29 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 22 Sep 2004 19:17:29 +0900
Subject: [Ultrapossum-cvs 513] ultrapossum/module/server 1.48, 1.49,
	update-server
Message-ID: <20040922101729.783F32AC03D@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/server/update-server,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- ultrapossum/module/server/update-server	2004/09/07 10:30:45	1.48
+++ ultrapossum/module/server/update-server	2004/09/22 10:17:29	1.49
@@ -16,7 +16,7 @@
 #
 
 # Usage:
-#    update-ultrapossum <configure|remove>
+#    update-server <configure|remove|sanity>
 #
 
 # $Id$


From taru ¡÷ users.sourceforge.jp  Wed Sep 22 19:33:40 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 22 Sep 2004 19:33:40 +0900
Subject: [Ultrapossum-cvs 514] ultrapossum 1.43,1.44,configure.in
Message-ID: <20040922103340.205912AC03D@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/configure.in,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ultrapossum/configure.in	2004/09/22 05:45:28	1.43
+++ ultrapossum/configure.in	2004/09/22 10:33:40	1.44
@@ -39,9 +39,12 @@
   for d in $2
   do
     d=$(eval echo `echo $d`)
-    if test -e "$d/$3"; then
-      $1="$d"
-    fi
+    for f in $3
+    do
+      if test -e "$d/$f"; then
+        $1="$d"
+      fi
+    done
   done
 fi
 
@@ -146,11 +149,11 @@
   UP_DIRECTORY(ldapdatadir,
 	/usr/share/ldap /usr/share/openldap /usr/local/share/ldap dnl
 	/usr/local/share/openldap $datadir/ldap $datadir/openldap,
-	ucdata,
+	ucdata ldapfriendly,
 [change default directory of openldap datadir])
 
   UP_DIRECTORY(ldaplibdir,
-  	/usr/lib/ldap /usr/lib/openldap /usr/local/lib/ldap dnl
+	/usr/lib/ldap /usr/lib/openldap /usr/local/lib/ldap dnl
 	/usr/local/lib/openldap $libdir/ldap $libdir/openldap,
 	.,
 [change default directory where openldap backend modules are located])


From taru ¡÷ users.sourceforge.jp  Wed Sep 22 19:33:52 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 22 Sep 2004 19:33:52 +0900
Subject: [Ultrapossum-cvs 515] ultrapossum 1.14,1.15,Makefile.am
Message-ID: <20040922103352.237502AC03D@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ultrapossum/Makefile.am	2004/09/16 07:40:28	1.14
+++ ultrapossum/Makefile.am	2004/09/22 10:33:52	1.15
@@ -61,6 +61,7 @@
 	perl/t/1.t \
 	ruby/ultrapossum.rb \
 	python/UltraPossum.py \
+	redhat/ultrapossum.init \
 	term \
 	COPYRIGHT
 


From taru ¡÷ users.sourceforge.jp  Wed Sep 22 19:53:07 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 22 Sep 2004 19:53:07 +0900
Subject: [Ultrapossum-cvs 516] ultrapossum 1.2,1.3,ultrapossum-server.in
Message-ID: <20040922105307.EDCAF2AC03D@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/ultrapossum-server.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ultrapossum/ultrapossum-server.in	2004/09/22 04:18:44	1.2
+++ ultrapossum/ultrapossum-server.in	2004/09/22 10:53:07	1.3
@@ -8,5 +8,39 @@
 
 PATH=$bindir:$sbindir:$PATH
 export PATH
-exec $pkgdatadir/module.d/server/startup "$@"
+
+usage() {
+  echo "Usage: $0 [-v] <start|stop>"
+}
+
+arg() {
+  case "x$1" in
+    xstart|xstop)
+      return 0
+    ;;
+    x*)
+      usage
+      exit 1
+    ;;
+  esac
+}
+
+case "x$1" in
+  x-h)
+    usage
+    exit 0
+  ;;
+  x-v)
+    shift
+    arg "$@"
+    exec $pkgdatadir/module.d/server/startup "$@"
+  ;;
+  x*)
+    arg "$@"
+    if ! $pkgdatadir/module.d/server/startup "$@" > /dev/null 2> /dev/null
+    then
+      echo "E: failed to start ultrapossum-server. use -v to see the detail." 1>&2
+    fi
+  ;;
+esac
 


From taru ¡÷ users.sourceforge.jp  Wed Sep 22 21:31:11 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 22 Sep 2004 21:31:11 +0900
Subject: [Ultrapossum-cvs 517] ultrapossum/init.d 1.1,1.2,10funcs
Message-ID: <20040922123111.AB6052AC010@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/init.d/10funcs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ultrapossum/init.d/10funcs	2004/09/15 12:17:50	1.1
+++ ultrapossum/init.d/10funcs	2004/09/22 12:31:11	1.2
@@ -54,5 +54,15 @@
   fi
 }
 
+# source <path>
+source_shell() {
+  if test -r "$1"; then
+    . $1
+  else
+    echo "E: no permission to read $1" 1>&2
+    exit 1
+  fi
+}
+
 ################################################################
 


From taru ¡÷ users.sourceforge.jp  Wed Sep 22 21:31:11 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 22 Sep 2004 21:31:11 +0900
Subject: [Ultrapossum-cvs 518] ultrapossum/module/failover ...
Message-ID: <20040922123111.D02082AC072@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/failover/authkeys.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ultrapossum/module/failover/authkeys.sh	2004/04/02 02:34:09	1.3
+++ ultrapossum/module/failover/authkeys.sh	2004/09/22 12:31:11	1.4
@@ -26,11 +26,11 @@
 key="sha1 $CREDENTIALS"
 
 if test -f $SYSCONFDIR/default.cf; then
-  . $SYSCONFDIR/default.cf
+  source_shell $SYSCONFDIR/default.cf
 fi
 
 if test -f default.cf; then
-  . default.cf
+  source_shell default.cf
 fi
 
 AUTHKEYSIN=$TEMPLATEDIR/authkeys.in
===================================================================
RCS file: ultrapossum/module/failover/ha.cf.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ultrapossum/module/failover/ha.cf.sh	2004/04/02 02:34:09	1.3
+++ ultrapossum/module/failover/ha.cf.sh	2004/09/22 12:31:11	1.4
@@ -36,11 +36,11 @@
 #watchdog="/dev/watchdog"
 
 if test -f $SYSCONFDIR/default.cf; then
-  . $SYSCONFDIR/default.cf
+  source_shell $SYSCONFDIR/default.cf
 fi
 
 if test -f default.cf; then
-  . default.cf
+  source_shell default.cf
 fi
 
 SUPPORTED_DIRECTIVE="logfile logfacility keepalive deadtime initdead hopfudge serial baud udpport udp mcast watchdog nice_failback"


From taru ¡÷ users.sourceforge.jp  Wed Sep 22 21:31:11 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 22 Sep 2004 21:31:11 +0900
Subject: [Ultrapossum-cvs 519] ultrapossum/module/failover/heartbeat ...
Message-ID: <20040922123111.E3D862AC073@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/failover/heartbeat/ldap,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ultrapossum/module/failover/heartbeat/ldap	2004/03/25 03:25:09	1.2
+++ ultrapossum/module/failover/heartbeat/ldap	2004/09/22 12:31:11	1.3
@@ -25,7 +25,7 @@
 trap "eval `ultrapossum-config term`" 0
 
 # Source function library.
-. $HA_DIR/shellfuncs
+source_shell $HA_DIR/shellfuncs
 
 ldap_start () {
 
===================================================================
RCS file: ultrapossum/module/failover/heartbeat/syncbackup,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ultrapossum/module/failover/heartbeat/syncbackup	2004/04/02 02:34:09	1.3
+++ ultrapossum/module/failover/heartbeat/syncbackup	2004/09/22 12:31:11	1.4
@@ -23,7 +23,7 @@
 trap "eval `ultrapossum-config term`" 0
 
 # Source function library.
-. $HA_DIR/shellfuncs
+source_shell $HA_DIR/shellfuncs
 
 stop () {
   ha_log "starting syncbackup slapd"


From taru ¡÷ users.sourceforge.jp  Wed Sep 22 21:31:12 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 22 Sep 2004 21:31:12 +0900
Subject: [Ultrapossum-cvs 520] ultrapossum/module/server ...
Message-ID: <20040922123112.1EF1F2AC074@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/server/10server,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ultrapossum/module/server/10server	2004/09/22 04:19:37	1.13
+++ ultrapossum/module/server/10server	2004/09/22 12:31:11	1.14
@@ -183,10 +183,10 @@
 
 case "$SLAPD_MAJOR_VERSION" in
         2.0)
-                . $MODULEDIR/server/2.0
+                source_shell $MODULEDIR/server/2.0
         ;;
         2.1|2.2)
-                . $MODULEDIR/server/2.1
+                source_shell $MODULEDIR/server/2.1
         ;;
         *)
                 echo "Unknown slapd version type $SLAPD_MAJOR_VERSION" 1>&2
===================================================================
RCS file: ultrapossum/module/server/2.1,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ultrapossum/module/server/2.1	2004/04/05 16:23:37	1.3
+++ ultrapossum/module/server/2.1	2004/09/22 12:31:11	1.4
@@ -17,5 +17,5 @@
 
 # $Id$
 
-. $MODULEDIR/server/2.0
+source_shell $MODULEDIR/server/2.0
 
===================================================================
RCS file: ultrapossum/module/server/apps,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ultrapossum/module/server/apps	2004/07/16 06:41:00	1.9
+++ ultrapossum/module/server/apps	2004/09/22 12:31:11	1.10
@@ -39,9 +39,9 @@
 		getapps | while read cf
 		do
 		  schemas=""
-		  . $APPSDIR/$cf
+		  source_shell $APPSDIR/$cf
 		  if test -f $APPSCONFDIR/$cf.cf; then
-		    . $APPSCONFDIR/$cf.cf
+		    source_shell $APPSCONFDIR/$cf.cf
 		  fi
 		  for schema in $schemas
 		  do
@@ -52,9 +52,9 @@
 	ldif)
 		getapps | while read cf
 		do
-		    . $APPSDIR/$cf
+		    source_shell $APPSDIR/$cf
 		    if test -f $APPSCONFDIR/$cf.cf; then
-		      . $APPSCONFDIR/$cf.cf
+		      source_shell $APPSCONFDIR/$cf.cf
 		    fi
 		    for app in $apps
 		    do
===================================================================
RCS file: ultrapossum/module/server/runtime,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ultrapossum/module/server/runtime	2004/04/02 02:34:10	1.4
+++ ultrapossum/module/server/runtime	2004/09/22 12:31:11	1.5
@@ -36,7 +36,7 @@
   echo "E: no permission to read server runtime status" 1>&2
   exit 1
 fi
-. "$ULTRAPOSSUMRUN"
+source_shell "$ULTRAPOSSUMRUN"
 
 for a in "$@"
 do
===================================================================
RCS file: ultrapossum/module/server/slapd.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ultrapossum/module/server/slapd.sh	2004/09/07 12:17:13	1.8
+++ ultrapossum/module/server/slapd.sh	2004/09/22 12:31:11	1.9
@@ -34,9 +34,9 @@
   ## TODO: choose apps
   for cf in `/bin/ls $APPSDIR`
   do
-    . $APPSDIR/$cf
+    source_shell $APPSDIR/$cf
     if test -f $APPSCONFDIR/$cf.cf; then
-      . $APPSCONFDIR/$cf.cf
+      source_shell $APPSCONFDIR/$cf.cf
     fi
     for i in $indexes_eq
     do
===================================================================
RCS file: ultrapossum/module/server/startup,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ultrapossum/module/server/startup	2004/09/22 10:16:40	1.14
+++ ultrapossum/module/server/startup	2004/09/22 12:31:11	1.15
@@ -55,11 +55,7 @@
 
     xstatus)
       if test -f "$ULTRAPOSSUMRUN"; then
-        if test -r "$ULTRAPOSSUMRUN"; then
-          . $ULTRAPOSSUMRUN
-	else
-	  echo "Warning: no permission to read ultrapossum runtime variable" 1>&2
-	fi
+        source_shell $ULTRAPOSSUMRUN
       fi
       if test `ldapmaster_status` = "running" ||
 	 test `ldapslave_status` = "running"; then
@@ -74,7 +70,7 @@
         configure_server
       fi
       if test "$1" = "stop" && test -f "$ULTRAPOSSUMRUN"; then
-        . $ULTRAPOSSUMRUN
+        source_shell "$ULTRAPOSSUMRUN"
       fi
       if test "$TYPE" = "master"; then
         ldapmaster_service_$1


From taru ¡÷ users.sourceforge.jp  Wed Sep 22 22:24:48 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 22 Sep 2004 22:24:48 +0900
Subject: [Ultrapossum-cvs 521] web 1.37,1.38,quickguide.html
Message-ID: <20040922132448.285512AC010@users.sourceforge.jp>

===================================================================
RCS file: web/quickguide.html,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- web/quickguide.html	2004/09/22 09:11:16	1.37
+++ web/quickguide.html	2004/09/22 13:24:48	1.38
@@ -29,9 +29,7 @@
 <h1>UltraPossum ¥¯¥¤¥Ã¥¯¥¬¥¤¥É for Debian</h1>
 
     <p> ¤³¤Î¥¬¥¤¥É¤Ï UltraPossum ¤ò
-Debian ¾å¤ÇÍøÍѤ¹¤ë¤¿¤á¤Î¼ê°ú¤Ç¤¹¡£Debian
-¥Ä¡¼¥ë¤ÎÍøÍѤò²¾Äꤷ¤¿µ­½Ò¤¬¤¤¤¯¤Ä¤«¸«¤é¤ì¤Þ¤¹¤¬¡¢Â¾¤Î¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤ò¤ª»È¤¤¤ÎÊý¤ÏŬµ¹Æɤߤ«¤¨¤Æ UltraPossum
-ƳÆþ¤Îή¤ì¤ò¤Ä¤«¤ó¤Ç¤¯¤À¤µ¤¤¡£ </p>
+Debian ¾å¤ÇÍøÍѤ¹¤ë¤¿¤á¤Î¼ê°ú¤Ç¤¹¡£Â¾¤Î¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤ò¤ª»È¤¤¤ÎÊý¤Ï¥½¡¼¥¹¤«¤é¥³¥ó¥Ñ¥¤¥ë¤·¤ÆÍøÍѤ¹¤ë¤¿¤á¤Î¼ê°ú¤¬<a href="quickguide_misc.html>¤³¤³</a>¤Ë¤¢¤ê¤Þ¤¹¤Î¤Ç»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ </p>
 
     <p> Ëܼê°ú¤Ç¤Ï UltraPossum ¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤«¤é UltraPossum
 Âбþ¥Ä¡¼¥ë¤Ç¤¢¤ë ultramigration ¤ò»È¤Ã¤Æ¡¢LDAP ¥Ç¥£¥ì¥¯¥È¥ê¤Ë /etc/passwd ¤Î¥æ¡¼¥¶¾ðÊó¤ò½ñ¤­¹þ¤ß¤Þ¤¹¡£¤½¤Î¸å


From taru ¡÷ users.sourceforge.jp  Wed Sep 22 22:25:06 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 22 Sep 2004 22:25:06 +0900
Subject: [Ultrapossum-cvs 522] web 1.38,1.39,quickguide.html
Message-ID: <20040922132506.387C52AC010@users.sourceforge.jp>

===================================================================
RCS file: web/quickguide.html,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- web/quickguide.html	2004/09/22 13:24:48	1.38
+++ web/quickguide.html	2004/09/22 13:25:06	1.39
@@ -29,7 +29,7 @@
 <h1>UltraPossum ¥¯¥¤¥Ã¥¯¥¬¥¤¥É for Debian</h1>
 
     <p> ¤³¤Î¥¬¥¤¥É¤Ï UltraPossum ¤ò
-Debian ¾å¤ÇÍøÍѤ¹¤ë¤¿¤á¤Î¼ê°ú¤Ç¤¹¡£Â¾¤Î¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤ò¤ª»È¤¤¤ÎÊý¤Ï¥½¡¼¥¹¤«¤é¥³¥ó¥Ñ¥¤¥ë¤·¤ÆÍøÍѤ¹¤ë¤¿¤á¤Î¼ê°ú¤¬<a href="quickguide_misc.html>¤³¤³</a>¤Ë¤¢¤ê¤Þ¤¹¤Î¤Ç»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ </p>
+Debian ¾å¤ÇÍøÍѤ¹¤ë¤¿¤á¤Î¼ê°ú¤Ç¤¹¡£Â¾¤Î¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤ò¤ª»È¤¤¤ÎÊý¤Ï¥½¡¼¥¹¤«¤é¥³¥ó¥Ñ¥¤¥ë¤·¤ÆÍøÍѤ¹¤ë¤¿¤á¤Î¼ê°ú¤¬<a href="quickguide_misc.html">¤³¤³</a>¤Ë¤¢¤ê¤Þ¤¹¤Î¤Ç»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ </p>
 
     <p> Ëܼê°ú¤Ç¤Ï UltraPossum ¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤«¤é UltraPossum
 Âбþ¥Ä¡¼¥ë¤Ç¤¢¤ë ultramigration ¤ò»È¤Ã¤Æ¡¢LDAP ¥Ç¥£¥ì¥¯¥È¥ê¤Ë /etc/passwd ¤Î¥æ¡¼¥¶¾ðÊó¤ò½ñ¤­¹þ¤ß¤Þ¤¹¡£¤½¤Î¸å


From taru ¡÷ users.sourceforge.jp  Wed Sep 22 22:46:30 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 22 Sep 2004 22:46:30 +0900
Subject: [Ultrapossum-cvs 523] plugin/sasl/debian 1.1,1.2,control
Message-ID: <20040922134630.051D12AC010@users.sourceforge.jp>

===================================================================
RCS file: plugin/sasl/debian/control,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin/sasl/debian/control	2004/06/19 15:01:14	1.1
+++ plugin/sasl/debian/control	2004/09/22 13:46:29	1.2
@@ -7,6 +7,6 @@
 
 Package: ultrapossum-sasl
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ultrapossum-server
+Depends: ${shlibs:Depends}, ${misc:Depends}, ultrapossum-server, sasl2-bin
 Description: UltraPossum Server SASL plugin
  <insert long description, indented with spaces>


From taru ¡÷ users.sourceforge.jp  Wed Sep 22 22:46:59 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 22 Sep 2004 22:46:59 +0900
Subject: [Ultrapossum-cvs 524] plugin/sasl/debian 1.2,1.3,control
Message-ID: <20040922134659.0D5C62AC010@users.sourceforge.jp>

===================================================================
RCS file: plugin/sasl/debian/control,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin/sasl/debian/control	2004/09/22 13:46:29	1.2
+++ plugin/sasl/debian/control	2004/09/22 13:46:59	1.3
@@ -2,7 +2,7 @@
 Section: net
 Priority: optional
 Maintainer: Masato Taruishi <taru ¡÷ ultrapossum.org>
-Build-Depends: debhelper (>= 4.0.0)
+Build-Depends-Indep: debhelper (>= 4.0.0), ultrapossum-dev
 Standards-Version: 3.6.0
 
 Package: ultrapossum-sasl


From taru ¡÷ users.sourceforge.jp  Wed Sep 22 23:00:51 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 22 Sep 2004 23:00:51 +0900
Subject: [Ultrapossum-cvs 525] plugin/sasl/debian 1.3,1.4,control
Message-ID: <20040922140051.9902C2AC010@users.sourceforge.jp>

===================================================================
RCS file: plugin/sasl/debian/control,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin/sasl/debian/control	2004/09/22 13:46:59	1.3
+++ plugin/sasl/debian/control	2004/09/22 14:00:51	1.4
@@ -7,6 +7,6 @@
 
 Package: ultrapossum-sasl
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ultrapossum-server, sasl2-bin
+Depends: ${shlibs:Depends}, ${misc:Depends}, ultrapossum-server, sasl2-bin, libsasl2-modules
 Description: UltraPossum Server SASL plugin
  <insert long description, indented with spaces>


From taru ¡÷ users.sourceforge.jp  Wed Sep 22 23:05:53 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 22 Sep 2004 23:05:53 +0900
Subject: [Ultrapossum-cvs 526] plugin/sasl 1.2, NONE, 01sasl NONE, 1.1,
	11sasl 1.1, 1.2, Makefile.am
Message-ID: <20040922140553.EB78D2AC010@users.sourceforge.jp>

===================================================================
RCS file: plugin/sasl/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin/sasl/Makefile.am	2004/05/14 11:25:13	1.1
+++ plugin/sasl/Makefile.am	2004/09/22 14:05:53	1.2
@@ -2,7 +2,7 @@
 modulename = sasl
 include ultrapossum.am
 
-module_DATA = 01sasl
+module_DATA = 11sasl
 update_SCRIPTS = update-sasl
 
 templatedir = $(sysconfdir)/ultrapossum/in.d
@@ -13,7 +13,7 @@
 EXTRA_DIST = \
 	update-sasl \
 	sasl-md5.in \
-	01sasl \
+	11sasl \
 	sasl-account \
 	sasl-authcid
 


From taru ¡÷ users.sourceforge.jp  Thu Sep 23 03:55:40 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 23 Sep 2004 03:55:40 +0900
Subject: [Ultrapossum-cvs 527] ultrapossum/module/server 1.9,1.10,formatdb.sh
Message-ID: <20040922185540.E5D582AC05A@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/server/formatdb.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ultrapossum/module/server/formatdb.sh	2004/09/22 10:16:40	1.9
+++ ultrapossum/module/server/formatdb.sh	2004/09/22 18:55:40	1.10
@@ -36,6 +36,8 @@
 fi
 
 /bin/rm -rf $DIRECTORY $CONFSTATUS $CHROOTDIRECTORY$DIRECTORY
+eval `ultrapossum-config init`
+trap "eval `ultrapossum-config term`" 0
 $exec_prefix/sbin/update-ultrapossum configure
 
 if test "x$status" = "xstarted"; then


From taru ¡÷ users.sourceforge.jp  Thu Sep 23 04:03:19 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 23 Sep 2004 04:03:19 +0900
Subject: [Ultrapossum-cvs 528] demo/haviewer 1.21,1.22,haviewer.glade
Message-ID: <20040922190319.6610E2AC05E@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/haviewer.glade,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- demo/haviewer/haviewer.glade	2004/09/15 17:50:48	1.21
+++ demo/haviewer/haviewer.glade	2004/09/22 19:03:19	1.22
@@ -32,6 +32,20 @@
 	  <property name="layout_style">GTK_BUTTONBOX_END</property>
 
 	  <child>
+	    <widget class="GtkButton" id="refresh">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-refresh</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">0</property>
+	      <signal name="clicked" handler="on_refresh_clicked" last_modification_time="Wed, 22 Sep 2004 17:49:59 GMT"/>
+	    </widget>
+	  </child>
+
+	  <child>
 	    <widget class="GtkButton" id="close">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>


From taru ¡÷ users.sourceforge.jp  Thu Sep 23 04:03:19 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 23 Sep 2004 04:03:19 +0900
Subject: [Ultrapossum-cvs 529] demo/haviewer/lib/haviewer ...
Message-ID: <20040922190319.885822AC060@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/lib/haviewer/haviewer.rb,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- demo/haviewer/lib/haviewer/haviewer.rb	2004/09/16 06:04:43	1.5
+++ demo/haviewer/lib/haviewer/haviewer.rb	2004/09/22 19:03:19	1.6
@@ -20,6 +20,17 @@
   $haview.glade["entry_update_error"].hide
 end
 
+def on_refresh_clicked
+  $threads.each do |t|
+    t.kill
+  end
+  HAViewer::UltraPossumHost.set_conf( UltraPossum::Config.new )
+  $haview.views.each do |key,view|
+    view.refresh
+  end
+  thread_start
+end
+
 class HAViewer
 
   Hosts = []
@@ -134,6 +145,9 @@
     def update(host)
     end
 
+    def refresh
+    end
+
   end
 
 
@@ -156,6 +170,24 @@
 
 end
 
+def thread_start
+  HAViewer::Hosts.each do |host|
+    $haview.views.each do |name,view|
+      view.update(host)
+    end
+    $threads << Thread.new {
+      while(1) do
+        host.update
+        $haview.views.each do |name,view|
+          view.update(host)
+          $haview.update
+        end
+        sleep 5
+      end
+    }
+  end
+end
+
 require 'haviewer/ultrapossum'
 
 Gtk.init
@@ -166,20 +198,9 @@
 $haview.add_view( "config", HAViewer::UltraPossum::ConfigView.new($haview) )
 $haview.glade["dialog1"].set_title(  "UltraPossum HA Viewer (#{HAViewer::UltraPossumHost.conf["ORGANIZATION"]})" )
 $haview.update
-HAViewer::Hosts.each do |host|
-  $haview.views.each do |name,view|
-    view.update(host)
-  end
-  Thread.new {
-    while(1) do
-      host.update
-      $haview.views.each do |name,view|
-        view.update(host)
-	$haview.update
-      end
-      sleep 5
-    end
-  }
-end
+$threads = []
+thread_start
+
+
 Gtk.main
 
===================================================================
RCS file: demo/haviewer/lib/haviewer/ultrapossum.rb,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- demo/haviewer/lib/haviewer/ultrapossum.rb	2004/09/17 06:35:05	1.10
+++ demo/haviewer/lib/haviewer/ultrapossum.rb	2004/09/22 19:03:19	1.11
@@ -45,6 +45,7 @@
 
     def UltraPossumHost.set_conf( conf )
       @@conf = conf
+      UltraPossumHost.update_hosts
     end
 
     def initialize( host, type )
@@ -131,8 +132,8 @@
 
   end
 
-  UltraPossumHosts = []
-  begin
+  @@hash = {}
+  def UltraPossumHost.update_hosts
     hash = {}
     ary =  [ UltraPossumHost.conf["MASTER"], UltraPossumHost.conf["BACKUP"], UltraPossumHost.conf["SYNCBACKUPS"] ]
     ary.each do |val|
@@ -140,24 +141,34 @@
       host = nil
       val.split(' ').each do |s|
         host = UltraPossumHost.new(s,"master")
-        if hash[s].nil?
+	hash[s] = host
+        if @@hash[s].nil?
           UltraPossumHosts << host
           Hosts << host
-          hash[s] = host
+          @@hash[s] = host
         end
       end
     end
     if ! UltraPossumHost.conf["SLAVES"].nil?
       UltraPossumHost.conf["SLAVES"].split(' ').each do |s|
         host = UltraPossumHost.new(s,"slave")
-        if hash[s].nil?
+	hash[s] = host
+        if @@hash[s].nil?
           UltraPossumHosts << host
           Hosts << host
-          hash[s] = host
+          @@hash[s] = host
         end
       end
     end
+    ( @@hash.keys - hash.keys ).each do |host|
+      Hosts.delete(@@hash[host])
+      UltraPossumHosts.delete(@@hash[host])
+      @@hash.delete(host)
+    end
   end
+
+  UltraPossumHosts = []
+  UltraPossumHost.update_hosts
   UltraPossumHost.update_latest_entryCSN
 
   class UltraPossum < HAViewer::View
@@ -171,16 +182,22 @@
       Column.size.times do |i|
         @columns << Gtk::TreeViewColumn.new(Column[i], Gtk::CellRendererText.new, { :markup => i })
       end
-      @row = {}
-      UltraPossumHosts.each do |host|
-        @row[host] = @list.append
+      @columns.each do |val|
+        @glade["treeview1"].append_column(val)
       end
       @master_icon = Signal::SignalFactory.create
       @slave_icon = Signal::SignalFactory.create
-      columns.each do |val|
-        @glade["treeview1"].append_column(val)
+      refresh
+    end
+
+    def refresh
+      @list.clear
+      @row = {}
+      UltraPossumHosts.each do |host|
+        @row[host] = @list.append
+	update(host)
       end
-      @glade["treeview1"].set_model(list)
+      @glade["treeview1"].set_model(@list)
     end
 
     def update(host)
@@ -290,14 +307,19 @@
         Column.size.times do |i|
           @columns << Gtk::TreeViewColumn.new(Column[i], Gtk::CellRendererText.new, { :markup => i })
         end
-        @row = {}
-        UltraPossumHosts.each do |host|
-          @row[host] = @list.append
-        end
         @columns.each do |val|
           @glade["treeview2"].append_column(val)
         end
         @glade["treeview2"].set_model(@list)
+	refresh
+      end
+
+      def refresh
+        @list.clear
+        @row = {}
+        UltraPossumHosts.each do |host|
+          @row[host] = @list.append
+        end
       end
 
       def update(host)
@@ -323,17 +345,23 @@
         Column.size.times do |i|
           @columns << Gtk::TreeViewColumn.new(Column[i], Gtk::CellRendererText.new, { :markup => i })
         end
+        @columns.each do |val|
+          @glade["treeview3"].append_column(val)
+        end
+        @glade["treeview3"].set_model(@list)
+	refresh
+      end
+
+      def refresh
+        @list.clear
         @row = {}
         UltraPossumHost.conf.keys.sort.each do |key|
           @row[key] = @list.append
           @list.set_value(@row[key], 0, key )
           @list.set_value(@row[key], 1, UltraPossumHost.conf[key] )
         end
-        @columns.each do |val|
-          @glade["treeview3"].append_column(val)
-        end
-        @glade["treeview3"].set_model(@list)
       end
+
     end
 
   end


From taru ¡÷ users.sourceforge.jp  Thu Sep 23 15:21:18 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 23 Sep 2004 15:21:18 +0900
Subject: [Ultrapossum-cvs 530] plugin/sasl ...
Message-ID: <20040923062118.3FB6D2AC074@users.sourceforge.jp>

===================================================================
RCS file: plugin/sasl/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin/sasl/Makefile.am	2004/09/22 14:05:53	1.2
+++ plugin/sasl/Makefile.am	2004/09/23 06:21:18	1.3
@@ -5,6 +5,8 @@
 module_DATA = 11sasl
 update_SCRIPTS = update-sasl
 
+modulesysconf_DATA = sasl.cf
+
 templatedir = $(sysconfdir)/ultrapossum/in.d
 template_DATA = sasl-md5.in
 
@@ -15,5 +17,5 @@
 	sasl-md5.in \
 	11sasl \
 	sasl-account \
-	sasl-authcid
+	sasl.cf
 
===================================================================
RCS file: plugin/sasl/sasl-account,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin/sasl/sasl-account	2004/06/19 15:30:31	1.2
+++ plugin/sasl/sasl-account	2004/09/23 06:21:18	1.3
@@ -8,16 +8,22 @@
 echo -n "Creating account..." 1>&2
 $MODULEDIR/server/apps list | while read cf
 do
-	. $APPSDIR/$cf
-	for app in $apps
-	do
-		pass=$(eval "echo \$${app}Password")
-                if test "x$pass" = "x"; then
-			pass=$ROOTPW
-		fi
-		echo -n " $app" 1>&2
-		echo "$pass" | saslpasswd2 -p -u $PACKAGE $app
-	done
+
+  if test "x$CREDENTIALS" != "x"; then
+    authcid="`echo $UPDATEDN | cut -d, -f1 | cut -d= -f2`"
+    echo -n " $authcid" 1>&2
+    echo "$CREDENTIALS" | saslpasswd2 -p -u $PACKAGE $authcid
+  fi
+  . $APPSDIR/$cf
+  for app in $apps
+  do
+    pass=$(eval "echo \$${app}Password")
+    if test "x$pass" = "x"; then
+      pass=$ROOTPW
+    fi
+    echo -n " $app" 1>&2
+    echo "$pass" | saslpasswd2 -p -u $PACKAGE $app
+  done
 
 done
 echo "" 1>&2
===================================================================
RCS file: plugin/sasl/sasl-md5.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin/sasl/sasl-md5.in	2004/05/14 16:11:00	1.1
+++ plugin/sasl/sasl-md5.in	2004/09/23 06:21:18	1.2
@@ -5,8 +5,8 @@
 # To use DN's userPassword by LDAP Password Modify Extended Operations
 password-hash	{CLEARTEXT}
 
-# User SASL/Digest-MD5 to real DN map
+# Application SASL/Digest-MD5 to real DN map
 sasl-regexp
-	uid=([^@]+),cn=digest-md5,cn=auth
-	ldap:///#SUFFIX#??sub?(uid=$1)
+	uid=([^@]+)@#PACKAGE#,cn=digest-md5,cn=auth
+	ldap:///#APPLICATION#??sub?(cn=$1)
 
===================================================================
RCS file: plugin/sasl/update-sasl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin/sasl/update-sasl	2004/05/14 11:25:13	1.1
+++ plugin/sasl/update-sasl	2004/09/23 06:21:18	1.2
@@ -27,7 +27,12 @@
   echo -n "Configuring SASL/Digest-MD5... " 1>&2
   id="SASL"
   add_startmark "##" $id > $tmp
-  sed -e "s/#SUFFIX#/$SUFFIX/" < $SASL_MD5_IN >> $tmp
+  SYNCRDN="`echo $SYNCDN | cut -d, -f1 | cut -d= -f2`"
+  sed -e "s/#SUFFIX#/$SUFFIX/" \
+  	-e "s/#APPLICATION#/$APPLICATION/" \
+	-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
   echo "done" 1>&2


From taru ¡÷ users.sourceforge.jp  Thu Sep 23 15:21:18 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 23 Sep 2004 15:21:18 +0900
Subject: [Ultrapossum-cvs 531] plugin/sasl/debian 1.2,1.3,postinst
Message-ID: <20040923062118.576162AC075@users.sourceforge.jp>

===================================================================
RCS file: plugin/sasl/debian/postinst,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin/sasl/debian/postinst	2004/06/19 15:30:31	1.2
+++ plugin/sasl/debian/postinst	2004/09/23 06:21:18	1.3
@@ -19,7 +19,7 @@
 
 case "$1" in
     configure)
-    	/usr/share/ultrapossum/update.d/update-sasl configure
+    	/usr/sbin/update-ultrapossum configure
         if [ -x "/etc/init.d/ultrapossum-server" ]; then
 	  if [ -x /usr/sbin/invoke-rc.d ]; then
 	    invoke-rc.d ultrapossum-server restart


From taru ¡÷ users.sourceforge.jp  Thu Sep 23 15:28:04 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 23 Sep 2004 15:28:04 +0900
Subject: [Ultrapossum-cvs 532] ultrapossum/module/server ...
Message-ID: <20040923062804.B9AAE2AC074@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/server/10server,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ultrapossum/module/server/10server	2004/09/22 12:31:11	1.14
+++ ultrapossum/module/server/10server	2004/09/23 06:28:04	1.15
@@ -261,7 +261,6 @@
 
 fi
 
-ACLAPPDNREGEX=".*,$APPLICATION"
 SLAPDURILIST="$LDAPURILIST"
 
   ;;
===================================================================
RCS file: ultrapossum/module/server/slapd-bdb.conf.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ultrapossum/module/server/slapd-bdb.conf.in	2004/05/23 11:59:56	1.5
+++ ultrapossum/module/server/slapd-bdb.conf.in	2004/09/23 06:28:04	1.6
@@ -31,7 +31,7 @@
 access to attrs=userPassword
 	by dn="#UPDATEDN#" write
 	by group/organizationalRole/roleOccupant="#ROOTDN#" write
-	by dn.regex="#ACLAPPDNREGEX#" write
+	by dn.regex=".*,#APPLICATION#" write
 	by anonymous auth
 	by self write
 	by * none
===================================================================
RCS file: ultrapossum/module/server/slapd-ldbm.conf.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ultrapossum/module/server/slapd-ldbm.conf.in	2004/05/19 16:32:23	1.3
+++ ultrapossum/module/server/slapd-ldbm.conf.in	2004/09/23 06:28:04	1.4
@@ -31,7 +31,7 @@
 access to attribute=userPassword
 	by dn="#UPDATEDN#" write
 	by group/organizationalRole/roleOccupant="#ROOTDN#" write
-	by dn.regex="#ACLAPPDNREGEX#" write
+	by dn.regex=".*,#APPLICATION#" write
 	by anonymous auth
 	by self write
 	by * none
===================================================================
RCS file: ultrapossum/module/server/slapd.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ultrapossum/module/server/slapd.sh	2004/09/22 12:31:11	1.9
+++ ultrapossum/module/server/slapd.sh	2004/09/23 06:28:04	1.10
@@ -71,17 +71,28 @@
   	-e "s/#SLAPROOTPW#/$SLAPROOTPW_ESCAPE/" -e "s!#DIRECTORY#!$DIRECTORY!" \
   	-e "s/#DBCACHESIZE#/$DBCACHESIZE/" -e "s/#APPLICATION#/$APPLICATION/" \
   	-e "s/#UPDATEDN#/$UPDATEDN/" -e "/#INDEXES#/ c\\" -e "$INDEXES" \
-  	-e "s!#REPLOGFILE#!$REPLOGFILE!" -e "s!#CACHESIZE#!$CACHESIZE!" \
-	-e "s!#ACLAPPDNREGEX#!$ACLAPPDNREGEX!"
+  	-e "s!#REPLOGFILE#!$REPLOGFILE!" -e "s!#CACHESIZE#!$CACHESIZE!"
 }
 
 master() {
   common
   for slave in $SLURPDSLAVES
   do
-    echo "replica host=$slave:$REPLICALISTENPORT binddn=\"$UPDATEDN\""
-    echo "	bindmethod=simple"
-    echo "	credentials=$CREDENTIALS"
+    echo "replica host=$slave:$REPLICALISTENPORT"
+    case "x$APPDNMODE" in
+      xsasl-digest-md5)
+        authcid="`echo $UPDATEDN | cut -d, -f1 | cut -d= -f2`@$PACKAGE"
+        echo "	authcid=\"$authcid\""
+        echo "	bindmethod=sasl"
+        echo "	saslmech=DIGEST-MD5"
+        echo "	credentials=$CREDENTIALS"
+      ;;
+      x*)
+        echo "	binddn=\"$UPDATEDN\""
+        echo "	bindmethod=simple"
+        echo "	credentials=$CREDENTIALS"
+      ;;
+    esac
     echo ""
   done
   if test "x$ROOTDN" = "x$UPDATEDN"; then
@@ -100,10 +111,21 @@
     do
       if test "x$HOST" != "x$slave"; then
         echo "replica host=$slave:$REPLICALISTENPORT"
-        echo "	binddn=\"$UPDATEDN\""
-        echo "	syncid=$slave"
-        echo "	bindmethod=simple"
-        echo "	credentials=$CREDENTIALS"
+	echo "	syncid=$slave"
+        case "x$APPDNMODE" in
+          xsasl-digest-md5)
+            authcid="`echo $UPDATEDN | cut -d, -f1 | cut -d= -f2`@$PACKAGE"
+            echo "	authcid=\"$authcid\""
+            echo "	bindmethod=sasl"
+            echo "	saslmech=DIGEST-MD5"
+            echo "	credentials=$CREDENTIALS"
+          ;;
+          x*)
+            echo "	binddn=\"$UPDATEDN\""
+            echo "	bindmethod=simple"
+            echo "	credentials=$CREDENTIALS"
+          ;;
+        esac
         echo ""
       fi
     done
@@ -122,10 +144,22 @@
   if include "$HOST" "$SYNCBACKUPS"; then
     echo "syncbackup syncid=$HOST"
     echo "	provider=$UPDATEREF"
-    echo "	binddn=$SYNCDN"
-    echo "	bindmethod=simple"
-    echo "	credentials=$SYNCPW"
+    case "x$APPDNMODE" in
+      sasl-digest-md5)
+        authcid="`echo $SYNCDN | cut -d, -f1 | cut -d= -f2`@$PACKAGE"
+        echo "	authcid=\"$authcid\""
+        echo "	bindmethod=sasl"
+        echo "	saslmech=DIGEST-MD5"
+        echo "	credentials=$SYNCPW"
+      ;;
+      *)
+        echo "	binddn=\"$SYNCDN\""
+        echo "	bindmethod=simple"
+        echo "	credentials=$SYNCPW"
+      ;;
+    esac
     echo "	checkinterval=10"
+    echo ""
   fi
 }
 


From taru ¡÷ users.sourceforge.jp  Thu Sep 23 15:29:33 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 23 Sep 2004 15:29:33 +0900
Subject: [Ultrapossum-cvs 533] ultrapossum/debian 1.55,1.56,changelog
Message-ID: <20040923062933.2F2E02AC074@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/changelog,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- ultrapossum/debian/changelog	2004/09/22 05:52:02	1.55
+++ ultrapossum/debian/changelog	2004/09/23 06:29:33	1.56
@@ -1,3 +1,10 @@
+ultrapossum (0.1beta10-0pre2) unstable; urgency=low
+
+  * Applied the latest upstream version.
+   - Support SASL/Digest-MD5 replication
+
+ -- Masato Taruishi <taru ¡÷ valinux.co.jp>  Thu, 23 Sep 2004 15:29:02 +0900
+
 ultrapossum (0.1beta10-0pre1) unstable; urgency=low
 
   * New upstream release.


From taru ¡÷ users.sourceforge.jp  Thu Sep 23 16:16:10 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 23 Sep 2004 16:16:10 +0900
Subject: [Ultrapossum-cvs 534] plugin/sasl 1.1,1.2,11sasl
Message-ID: <20040923071610.B7EA82AC01A@users.sourceforge.jp>

===================================================================
RCS file: plugin/sasl/11sasl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin/sasl/11sasl	2004/09/22 14:05:53	1.1
+++ plugin/sasl/11sasl	2004/09/23 07:16:10	1.2
@@ -23,17 +23,13 @@
 # Defining Variables
 if test "x$cache" = "x"; then
   SASL_MD5_IN=$(ultrapossum_getconf SASL_MD5_IN "$TEMPLATEDIR/sasl-md5.in")
+  APPDNMODE=$(ultrapossum_getconf APPDNMODE "sasl-digest-md5")
 fi
 
 # Parsing configuration file
 eval "`ultrapossum_parse_config sasl`"
 
 # Calculating Logical Variables
-
-if test "x$ULTRAPOSSUM_MODULE_SASL" = "xinstalled"; then
-  APPDNMODE="sasl"
-  ACLAPPDNREGEX="[^@+]@$PACKAGE,cn=digest-md5,cn=auth"
-fi
 
   ;;
 


From taru ¡÷ users.sourceforge.jp  Thu Sep 23 16:16:10 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 23 Sep 2004 16:16:10 +0900
Subject: [Ultrapossum-cvs 535] plugin/sasl/debian 1.4,1.5,control
Message-ID: <20040923071610.D67162AC074@users.sourceforge.jp>

===================================================================
RCS file: plugin/sasl/debian/control,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin/sasl/debian/control	2004/09/22 14:00:51	1.4
+++ plugin/sasl/debian/control	2004/09/23 07:16:10	1.5
@@ -7,6 +7,6 @@
 
 Package: ultrapossum-sasl
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ultrapossum-server, sasl2-bin, libsasl2-modules
+Depends: ${shlibs:Depends}, ${misc:Depends}, ultrapossum-server (>= 0.1beta10-0pre2), sasl2-bin, libsasl2-modules
 Description: UltraPossum Server SASL plugin
  <insert long description, indented with spaces>


From taru ¡÷ users.sourceforge.jp  Thu Sep 23 17:00:51 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 23 Sep 2004 17:00:51 +0900
Subject: [Ultrapossum-cvs 536] demo/haviewer/lib/haviewer ...
Message-ID: <20040923080051.9F5852AC014@users.sourceforge.jp>

===================================================================
RCS file: demo/haviewer/lib/haviewer/haviewer.rb,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- demo/haviewer/lib/haviewer/haviewer.rb	2004/09/22 19:03:19	1.6
+++ demo/haviewer/lib/haviewer/haviewer.rb	2004/09/23 08:00:51	1.7
@@ -22,8 +22,9 @@
 
 def on_refresh_clicked
   $threads.each do |t|
-    t.kill
+    t.exit
   end
+  $threads.clear
   HAViewer::UltraPossumHost.set_conf( UltraPossum::Config.new )
   $haview.views.each do |key,view|
     view.refresh
===================================================================
RCS file: demo/haviewer/lib/haviewer/ultrapossum.rb,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- demo/haviewer/lib/haviewer/ultrapossum.rb	2004/09/22 19:03:19	1.11
+++ demo/haviewer/lib/haviewer/ultrapossum.rb	2004/09/23 08:00:51	1.12
@@ -86,7 +86,7 @@
       sincebuf = nil
 
       snmpget = "snmpget -On -v1 -t 3 -c ultrapossum #{@host} #{status} #{pid} #{since}"
-      puts snmpget if $DEBUG
+      $stderr.puts "#{`date`.chomp} #{snmpget}" if $DEBUG
       buf = `#{snmpget}`
       buf.each_line do |line|
         case line


From taru ¡÷ users.sourceforge.jp  Thu Sep 23 17:00:51 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 23 Sep 2004 17:00:51 +0900
Subject: [Ultrapossum-cvs 537] plugin/sasl 1.2,1.3,11sasl 1.1,1.2,sasl.cf
Message-ID: <20040923080051.C69882AC01A@users.sourceforge.jp>

===================================================================
RCS file: plugin/sasl/11sasl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin/sasl/11sasl	2004/09/23 07:16:10	1.2
+++ plugin/sasl/11sasl	2004/09/23 08:00:51	1.3
@@ -23,7 +23,7 @@
 # Defining Variables
 if test "x$cache" = "x"; then
   SASL_MD5_IN=$(ultrapossum_getconf SASL_MD5_IN "$TEMPLATEDIR/sasl-md5.in")
-  APPDNMODE=$(ultrapossum_getconf APPDNMODE "sasl-digest-md5")
+  APPDNMODE=$(ultrapossum_getconf APPDNMODE "SASL/Digest-MD5")
 fi
 
 # Parsing configuration file
===================================================================
RCS file: plugin/sasl/sasl.cf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin/sasl/sasl.cf	2004/09/23 06:21:18	1.1
+++ plugin/sasl/sasl.cf	2004/09/23 08:00:51	1.2
@@ -1,5 +1,5 @@
 # UltraPossum SASL plugin configuration
 
 ## Bind mode to use for ultrapossum application
-#APPDNMODE="sasl-digest-md5"
+#APPDNMODE="SASL/Digest-MD5"
 


From taru ¡÷ users.sourceforge.jp  Thu Sep 23 17:00:51 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 23 Sep 2004 17:00:51 +0900
Subject: [Ultrapossum-cvs 538] ultrapossum/module/server 1.10,1.11,slapd.sh
Message-ID: <20040923080051.DFB592AC074@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/server/slapd.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ultrapossum/module/server/slapd.sh	2004/09/23 06:28:04	1.10
+++ ultrapossum/module/server/slapd.sh	2004/09/23 08:00:51	1.11
@@ -80,7 +80,7 @@
   do
     echo "replica host=$slave:$REPLICALISTENPORT"
     case "x$APPDNMODE" in
-      xsasl-digest-md5)
+      xSASL/Digest-MD5)
         authcid="`echo $UPDATEDN | cut -d, -f1 | cut -d= -f2`@$PACKAGE"
         echo "	authcid=\"$authcid\""
         echo "	bindmethod=sasl"
@@ -113,7 +113,7 @@
         echo "replica host=$slave:$REPLICALISTENPORT"
 	echo "	syncid=$slave"
         case "x$APPDNMODE" in
-          xsasl-digest-md5)
+          xSASL/Digest-MD5)
             authcid="`echo $UPDATEDN | cut -d, -f1 | cut -d= -f2`@$PACKAGE"
             echo "	authcid=\"$authcid\""
             echo "	bindmethod=sasl"
@@ -145,14 +145,14 @@
     echo "syncbackup syncid=$HOST"
     echo "	provider=$UPDATEREF"
     case "x$APPDNMODE" in
-      sasl-digest-md5)
+      xSASL/Digest-MD5)
         authcid="`echo $SYNCDN | cut -d, -f1 | cut -d= -f2`@$PACKAGE"
         echo "	authcid=\"$authcid\""
         echo "	bindmethod=sasl"
         echo "	saslmech=DIGEST-MD5"
         echo "	credentials=$SYNCPW"
       ;;
-      *)
+      x*)
         echo "	binddn=\"$SYNCDN\""
         echo "	bindmethod=simple"
         echo "	credentials=$SYNCPW"


From taru ¡÷ users.sourceforge.jp  Thu Sep 23 17:29:36 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 23 Sep 2004 17:29:36 +0900
Subject: [Ultrapossum-cvs 539] ultrapossum/module/server ...
Message-ID: <20040923082936.1F6D52AC014@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/server/10server,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ultrapossum/module/server/10server	2004/09/23 06:28:04	1.15
+++ ultrapossum/module/server/10server	2004/09/23 08:29:36	1.16
@@ -232,10 +232,6 @@
   CREDENTIALS="XXXXXXXX"
 fi
 ROOTDN=`ultrapossum_getconf ROOTDN $ROOTRDN,$SUFFIX`
-SYNCDN=`ultrapossum_getconf SYNCDN $ROOTDN`
-if test "x$SYNCDN" = "x$ROOTDN"; then
-  SYNCPW=`ultrapossum_getconf SYNCPW $ROOTPW`
-fi
 
 if test "x$SECRETCF" != "x"; then
   if $SLAPPASSWD -s $ROOTPW > /dev/null 2> /dev/null; then
===================================================================
RCS file: ultrapossum/module/server/server.cf,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ultrapossum/module/server/server.cf	2004/06/24 10:12:54	1.11
+++ ultrapossum/module/server/server.cf	2004/09/23 08:29:36	1.12
@@ -86,11 +86,5 @@
 # List of syncbcakup servers
 #SYNCBACKUPS=""
 
-# DN to allow startSYNC
-#SYNCDN=""
-
-# Password of SYNCDN
-#SYNCPW=""
-
 # Enable weaksync mode
 #WEAKSYNC=""
===================================================================
RCS file: ultrapossum/module/server/slapd.sh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ultrapossum/module/server/slapd.sh	2004/09/23 08:00:51	1.11
+++ ultrapossum/module/server/slapd.sh	2004/09/23 08:29:36	1.12
@@ -103,7 +103,7 @@
     fi
   fi
   if test "x$SYNCBACKUPS" != "x"; then
-    echo "syncdn $SYNCDN"
+    echo "syncdn $UPDATEDN"
     if test "x$WEAKSYNC" != "x"; then
       echo "weaksync on"
     fi
@@ -146,16 +146,16 @@
     echo "	provider=$UPDATEREF"
     case "x$APPDNMODE" in
       xSASL/Digest-MD5)
-        authcid="`echo $SYNCDN | cut -d, -f1 | cut -d= -f2`@$PACKAGE"
+        authcid="`echo $UPDATEDN | cut -d, -f1 | cut -d= -f2`@$PACKAGE"
         echo "	authcid=\"$authcid\""
         echo "	bindmethod=sasl"
         echo "	saslmech=DIGEST-MD5"
-        echo "	credentials=$SYNCPW"
+        echo "	credentials=$CREDENTIALS"
       ;;
       x*)
-        echo "	binddn=\"$SYNCDN\""
+        echo "	binddn=\"$UPDATEDN\""
         echo "	bindmethod=simple"
-        echo "	credentials=$SYNCPW"
+        echo "	credentials=$CREDENTIALS"
       ;;
     esac
     echo "	checkinterval=10"


From taru ¡÷ users.sourceforge.jp  Thu Sep 23 19:05:09 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 23 Sep 2004 19:05:09 +0900
Subject: [Ultrapossum-cvs 540] web 1.16,1.17,faq.html
Message-ID: <20040923100509.734DE2AC013@users.sourceforge.jp>

===================================================================
RCS file: web/faq.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- web/faq.html	2004/09/17 06:45:35	1.16
+++ web/faq.html	2004/09/23 10:05:09	1.17
@@ -50,7 +50,10 @@
 °é¤Æ¤Þ¤¹¡£¥ª¡¼¥¹¥È¥é¥ê¥¢¤Ç¤Ï¡¢¤È¤­¤Ë̱²È¤Î²°º¬Î¢¤ËÁã¤òºî¤ê¡¢
 ÌëÃæ¤Ë¥É¥¿¥Ð¥¿¤È²°º¬¤òÊ⤭¤Þ¤ï¤ê¤³¤È¤â¤¢¤ê¤Þ¤¹¡£
 ¤Þ¤¿¡¢Possum¤È¤¤¤¦Ã±¸ì¤Ï¡¢¥é¥Æ¥ó¸ì¤Ë¤ª¤¤¤Æ¡Ö²Äǽ¤Ç¤¢¤ë¡×¤È¤¤¤¦°ÕÌ£¤ò
-»ý¤Á¡¢±Ñ¸ì¤Îpossible, possibilityÅù¤Î¸ì¸»¤Ç¤â¤¢¤ê¤Þ¤¹¡£</p></dd>
+»ý¤Á¡¢±Ñ¸ì¤Îpossible, possibilityÅù¤Î¸ì¸»¤Ç¤â¤¢¤ê¤Þ¤¹¡£</p>
+	<p>¤Ê¤ª¡¢¥¢¥á¥ê¥«ÂçΦ¤Ë¤ÏƱ¤¸Í­ÂÞÎà¤Ç¤Ï¤¢¤ê¤Þ¤¹¤¬²Ê¤¬°ã¤¦¥Õ¥¯¥í¥Í¥º¥ß¤Î»ö¤ò Possum ¤È¸Æ¤Ó¤Þ¤¹¡£UltraPossum ¤Î Possum ¤Ï¤³¤Î¥Õ¥¯¥í¥Í¥º¥ß¤Î»ö¤Ç¤Ï¤Ê¤¯¡¢¥ª¡¼¥¹¥È¥é¥ê¥¢¤ËÀ³Â©¤¹¤ë¥¯¥¹¥¯¥¹¤Î»ö¤Ç¤¹¡£</p>
+
+</dd>
     </dl>
 
 <br clear=left>


From taru ¡÷ users.sourceforge.jp  Thu Sep 23 19:05:36 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 23 Sep 2004 19:05:36 +0900
Subject: [Ultrapossum-cvs 541] web 1.1,1.2,update.sh
Message-ID: <20040923100536.5C7C22AC013@users.sourceforge.jp>

===================================================================
RCS file: web/update.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- web/update.sh	2004/04/02 19:02:26	1.1
+++ web/update.sh	2004/09/23 10:05:36	1.2
@@ -1,3 +1,3 @@
 #!/bin/sh
-cvs commit -m update; ssh shell.sourceforge.jp bin/update-ultrapossum-web
+cvs commit -m update; ssh taru ¡÷ shell.sourceforge.jp bin/update-ultrapossum-web
 


From taru ¡÷ users.sourceforge.jp  Thu Sep 23 19:06:27 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 23 Sep 2004 19:06:27 +0900
Subject: [Ultrapossum-cvs 542] web 1.17,1.18,faq.html
Message-ID: <20040923100627.3D9202AC013@users.sourceforge.jp>

===================================================================
RCS file: web/faq.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- web/faq.html	2004/09/23 10:05:09	1.17
+++ web/faq.html	2004/09/23 10:06:27	1.18
@@ -51,7 +51,7 @@
 ÌëÃæ¤Ë¥É¥¿¥Ð¥¿¤È²°º¬¤òÊ⤭¤Þ¤ï¤ê¤³¤È¤â¤¢¤ê¤Þ¤¹¡£
 ¤Þ¤¿¡¢Possum¤È¤¤¤¦Ã±¸ì¤Ï¡¢¥é¥Æ¥ó¸ì¤Ë¤ª¤¤¤Æ¡Ö²Äǽ¤Ç¤¢¤ë¡×¤È¤¤¤¦°ÕÌ£¤ò
 »ý¤Á¡¢±Ñ¸ì¤Îpossible, possibilityÅù¤Î¸ì¸»¤Ç¤â¤¢¤ê¤Þ¤¹¡£</p>
-	<p>¤Ê¤ª¡¢¥¢¥á¥ê¥«ÂçΦ¤Ë¤ÏƱ¤¸Í­ÂÞÎà¤Ç¤Ï¤¢¤ê¤Þ¤¹¤¬²Ê¤¬°ã¤¦¥Õ¥¯¥í¥Í¥º¥ß¤Î»ö¤ò Possum ¤È¸Æ¤Ó¤Þ¤¹¡£UltraPossum ¤Î Possum ¤Ï¤³¤Î¥Õ¥¯¥í¥Í¥º¥ß¤Î»ö¤Ç¤Ï¤Ê¤¯¡¢¥ª¡¼¥¹¥È¥é¥ê¥¢¤ËÀ³Â©¤¹¤ë¥¯¥¹¥¯¥¹¤Î»ö¤Ç¤¹¡£</p>
+	<p>¤Ê¤ª¡¢¥¢¥á¥ê¥«ÂçΦ¤Ç¤ÏƱ¤¸Í­ÂÞÎà¤Ç¤Ï¤¢¤ê¤Þ¤¹¤¬²Ê¤¬°ã¤¦¥Õ¥¯¥í¥Í¥º¥ß¤Î»ö¤ò Possum ¤È¸Æ¤Ó¤Þ¤¹¡£UltraPossum ¤Î Possum ¤Ï¤³¤Î¥Õ¥¯¥í¥Í¥º¥ß¤Î»ö¤Ç¤Ï¤Ê¤¯¡¢¥ª¡¼¥¹¥È¥é¥ê¥¢¤ËÀ³Â©¤¹¤ë¥¯¥¹¥¯¥¹¤Î»ö¤Ç¤¹¡£</p>
 
 </dd>
     </dl>


From taru ¡÷ users.sourceforge.jp  Thu Sep 23 19:07:41 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 23 Sep 2004 19:07:41 +0900
Subject: [Ultrapossum-cvs 543] web 1.18,1.19,faq.html
Message-ID: <20040923100741.878142AC013@users.sourceforge.jp>

===================================================================
RCS file: web/faq.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- web/faq.html	2004/09/23 10:06:27	1.18
+++ web/faq.html	2004/09/23 10:07:41	1.19
@@ -51,7 +51,7 @@
 ÌëÃæ¤Ë¥É¥¿¥Ð¥¿¤È²°º¬¤òÊ⤭¤Þ¤ï¤ê¤³¤È¤â¤¢¤ê¤Þ¤¹¡£
 ¤Þ¤¿¡¢Possum¤È¤¤¤¦Ã±¸ì¤Ï¡¢¥é¥Æ¥ó¸ì¤Ë¤ª¤¤¤Æ¡Ö²Äǽ¤Ç¤¢¤ë¡×¤È¤¤¤¦°ÕÌ£¤ò
 »ý¤Á¡¢±Ñ¸ì¤Îpossible, possibilityÅù¤Î¸ì¸»¤Ç¤â¤¢¤ê¤Þ¤¹¡£</p>
-	<p>¤Ê¤ª¡¢¥¢¥á¥ê¥«ÂçΦ¤Ç¤ÏƱ¤¸Í­ÂÞÎà¤Ç¤Ï¤¢¤ê¤Þ¤¹¤¬²Ê¤¬°ã¤¦¥Õ¥¯¥í¥Í¥º¥ß¤Î»ö¤ò Possum ¤È¸Æ¤Ó¤Þ¤¹¡£UltraPossum ¤Î Possum ¤Ï¤³¤Î¥Õ¥¯¥í¥Í¥º¥ß¤Î»ö¤Ç¤Ï¤Ê¤¯¡¢¥ª¡¼¥¹¥È¥é¥ê¥¢¤ËÀ³Â©¤¹¤ë¥¯¥¹¥¯¥¹¤Î»ö¤Ç¤¹¡£</p>
+	<p>¤Ê¤ª¡¢¥¢¥á¥ê¥«ÂçΦ¤Ç¤ÏƱ¤¸Í­ÂÞÎà¤Ç¤Ï¤¢¤ê¤Þ¤¹¤¬²Ê¤¬°ã¤¦¥Õ¥¯¥í¥Í¥º¥ß¤¬¥¢¥á¥ê¥«ÂçΦͣ°ì¤ÎÍ­ÂÞÎà¤È¤·¤ÆÀ³Â©¤·¤Æ¤ª¤ê¡¢¤³¤Îưʪ¤ò Possum ¤È¸Æ¤Ó¤Þ¤¹¡£UltraPossum ¤Î Possum ¤Ï¤³¤Î¥Õ¥¯¥í¥Í¥º¥ß¤Î»ö¤Ç¤Ï¤Ê¤¯¡¢¥ª¡¼¥¹¥È¥é¥ê¥¢¤ËÀ³Â©¤¹¤ë¥¯¥¹¥¯¥¹¤Î»ö¤Ç¤¹¡£</p>
 
 </dd>
     </dl>


From taru ¡÷ users.sourceforge.jp  Thu Sep 23 20:05:18 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 23 Sep 2004 20:05:18 +0900
Subject: [Ultrapossum-cvs 544] ultrapossum/init.d 1.1,1.2,10edit
Message-ID: <20040923110518.392712AC014@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/init.d/10edit,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ultrapossum/init.d/10edit	2004/09/15 12:17:50	1.1
+++ ultrapossum/init.d/10edit	2004/09/23 11:05:18	1.2
@@ -35,7 +35,7 @@
   if grep "$ULTRAPOSSUMMARK-$3 START" $1 > /dev/null; then
     replace_vaconf $1 $2 $3
   else
-    /bin/cp -p $2 $2.tmp
+    /bin/cp -p $1 $2.tmp
     cat $2 > $2.tmp
     cat $1 >> $2.tmp
     /bin/mv $2.tmp $1


From taru ¡÷ users.sourceforge.jp  Fri Sep 24 12:09:23 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 24 Sep 2004 12:09:23 +0900
Subject: [Ultrapossum-cvs 545] plugin/sasl 1.2,1.3,sasl-md5.in
Message-ID: <20040924030923.4D3222AC029@users.sourceforge.jp>

===================================================================
RCS file: plugin/sasl/sasl-md5.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin/sasl/sasl-md5.in	2004/09/23 06:21:18	1.2
+++ plugin/sasl/sasl-md5.in	2004/09/24 03:09:23	1.3
@@ -3,10 +3,18 @@
 ##
 
 # To use DN's userPassword by LDAP Password Modify Extended Operations
+# by SASL bind.
 password-hash	{CLEARTEXT}
 
 # Application SASL/Digest-MD5 to real DN map
 sasl-regexp
 	uid=([^@]+)@#PACKAGE#,cn=digest-md5,cn=auth
 	ldap:///#APPLICATION#??sub?(cn=$1)
+
+# User SASL/Digest-MD5 to real DN map
+# You can use userPassword attribute of LDAP entries for SASL bind.
+# In order to this work, you have to store your password in clear text.
+sasl-regexp
+	uid=([^@]+),cn=digest-md5,cn=auth
+	ldap:///#SUFFIX#??sub?(uid=$1)
 


From taru ¡÷ users.sourceforge.jp  Fri Sep 24 12:12:21 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 24 Sep 2004 12:12:21 +0900
Subject: [Ultrapossum-cvs 546] plugin/sasl 1.2,1.3,update-sasl
Message-ID: <20040924031221.61C362AC058@users.sourceforge.jp>

===================================================================
RCS file: plugin/sasl/update-sasl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin/sasl/update-sasl	2004/09/23 06:21:18	1.2
+++ plugin/sasl/update-sasl	2004/09/24 03:12:21	1.3
@@ -25,16 +25,18 @@
 
 configure() {
   echo -n "Configuring SASL/Digest-MD5... " 1>&2
-  id="SASL"
-  add_startmark "##" $id > $tmp
-  SYNCRDN="`echo $SYNCDN | cut -d, -f1 | cut -d= -f2`"
-  sed -e "s/#SUFFIX#/$SUFFIX/" \
-  	-e "s/#APPLICATION#/$APPLICATION/" \
+  if test -f "$SASL_MD5_IN"; then
+    id="SASL"
+    add_startmark "##" $id > $tmp
+    SYNCRDN="`echo $SYNCDN | cut -d, -f1 | cut -d= -f2`"
+    sed -e "s/#SUFFIX#/$SUFFIX/" \
+   	-e "s/#APPLICATION#/$APPLICATION/" \
 	-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
+    add_endmark "##" $id >> $tmp
+    add_vaconf $SLAPDCONF $tmp $id
+  fi
   echo "done" 1>&2
   $MODULEDIR/sasl/sasl-account
 }


From taru ¡÷ users.sourceforge.jp  Fri Sep 24 12:46:08 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 24 Sep 2004 12:46:08 +0900
Subject: [Ultrapossum-cvs 547] ultrapossum/debian ...
Message-ID: <20040924034608.045222AC029@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/ultrapossum-common.postinst,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ultrapossum/debian/ultrapossum-common.postinst	2004/09/21 04:58:38	1.11
+++ ultrapossum/debian/ultrapossum-common.postinst	2004/09/24 03:46:07	1.12
@@ -64,9 +64,6 @@
     ;;
     *)
       ultrapossum_setconf_shell /etc/ultrapossum/config.cf ULTRAPOSSUM_CONFIG_BACKEND ""
-      install -d /etc/ultrapossum/
-      ucf /usr/share/ultrapossum/ucf/ultrapossum/ultrapossum.cf \
-        /etc/ultrapossum/ultrapossum.cf
     ;;
   esac
   eval `ultrapossum-config term`
@@ -77,7 +74,7 @@
 case "$1" in
     configure)
 
-	for f in config.cf debian.cf secret.cf
+	for f in ultrapossum.cf config.cf debian.cf secret.cf
 	do
 	        install -d `dirname /etc/ultrapossum/$f`
 		ucf /usr/share/ultrapossum/ucf/ultrapossum/$f \
===================================================================
RCS file: ultrapossum/debian/ultrapossum-common.templates,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ultrapossum/debian/ultrapossum-common.templates	2004/09/20 03:01:36	1.7
+++ ultrapossum/debian/ultrapossum-common.templates	2004/09/24 03:46:07	1.8
@@ -5,10 +5,11 @@
 _Description: Which backend do you want to use to store configurations
  UltraPossum stores your configuration in a configuration backend. You
  can select the backend to use. In most of cases, the backend 'file'
- is the best choice. This backend holds configurations as file. If
- you want to share configurations with ultrapossum servers, then you
- may want to select ldap backend. This backend holds them in LDAP
- directory.
+ is the best choice. This backend holds configurations as file in shell
+ fragment. If you want to share configurations between ultrapossum servers,
+ then you may want to select ldap backend. This backend retrieves default
+ configurations from LDAP directory. You can overwrite every configuartion
+ by the same way as the file backend.
 
 Template: ultrapossum-common/rootpw
 Type: password
===================================================================
RCS file: ultrapossum/debian/ultrapossum-failover.postinst,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ultrapossum/debian/ultrapossum-failover.postinst	2004/09/17 03:05:00	1.10
+++ ultrapossum/debian/ultrapossum-failover.postinst	2004/09/24 03:46:07	1.11
@@ -42,17 +42,7 @@
         eval `ultrapossum-config init`
         trap "eval `ultrapossum-config term`" 0
 
-	case "$ULTRAPOSSUM_CONFIG_BACKEND" in
-	  ldap)
-	    :
-	  ;;
-	  *)
-	    install -d /etc/ultrapossum/module.d
-	    ucf /usr/share/ultrapossum/ucf/ultrapossum/module.d/failover.cf \
-	  	/etc/ultrapossum/module.d/failover.cf
-	  ;;
-	esac        
-	for f in in.d/authkeys.in \
+	for f in module.d/failover.cf in.d/authkeys.in \
 		in.d/ha.cf.in in.d/haresources.in in.d/recovery.conf.in \
 		in.d/ultrapossum.mon.cf.in
 	do
===================================================================
RCS file: ultrapossum/debian/ultrapossum-server.postinst,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ultrapossum/debian/ultrapossum-server.postinst	2004/09/20 03:01:36	1.28
+++ ultrapossum/debian/ultrapossum-server.postinst	2004/09/24 03:46:07	1.29
@@ -61,17 +61,7 @@
         eval `ultrapossum-config init`
 	trap "eval `ultrapossum-config term`" 0
 
-	case "$ULTRAPOSSUM_CONFIG_BACKEND" in
-	  ldap)
-	    :
-	  ;;
-	  *)
-	    install -d /etc/ultrapossum/module.d
-	    ucf /usr/share/ultrapossum/ucf/ultrapossum/module.d/server.cf \
-	  	/etc/ultrapossum/module.d/server.cf
-	  ;;
-	esac
-	for f in default.cf in.d/slapd-bdb.conf.in \
+	for f in module.d/server.cf default.cf in.d/slapd-bdb.conf.in \
 		in.d/slapd-ldbm.conf.in in.d/init.ldif.in
 	do
 	  install -d `dirname /etc/ultrapossum/$f`
===================================================================
RCS file: ultrapossum/debian/ultrapossum-tls.postinst,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ultrapossum/debian/ultrapossum-tls.postinst	2004/09/16 18:30:13	1.7
+++ ultrapossum/debian/ultrapossum-tls.postinst	2004/09/24 03:46:07	1.8
@@ -41,16 +41,9 @@
 	eval `ultrapossum-config init`
 	trap "eval `ultrapossum-config term`" 0
 
-        case "$ULTRAPOSSUM_CONFIG_BACKEND" in
-          ldap)
-            :
-          ;;
-          *)
-            install -d /etc/ultrapossum/module.d/
-      	    ucf /usr/share/ultrapossum/ucf/ultrapossum/module.d/startTLS.cf \
-		/etc/ultrapossum/module.d/startTLS.cf
-          ;;
-        esac
+        install -d /etc/ultrapossum/module.d/
+      	ucf /usr/share/ultrapossum/ucf/ultrapossum/module.d/startTLS.cf \
+	  /etc/ultrapossum/module.d/startTLS.cf
 
 	settlsconfig certcountry CERTCOUNTRY
 	settlsconfig certstate CERTSTATE


From taru ¡÷ users.sourceforge.jp  Fri Sep 24 12:46:08 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 24 Sep 2004 12:46:08 +0900
Subject: [Ultrapossum-cvs 548] ultrapossum/init.d 1.7, 1.8, 10config 1.5, 1.6,
	15variable
Message-ID: <20040924034608.1ECFB2AC07F@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/init.d/10config,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ultrapossum/init.d/10config	2004/09/17 12:47:44	1.7
+++ ultrapossum/init.d/10config	2004/09/24 03:46:08	1.8
@@ -35,21 +35,12 @@
 
 # ultrapossum_setconf <category> <name> <val>
 ultrapossum_setconf() {
-
   if test "x$1" = "x.status"; then
     touch $localstatedir/lib/$PACKAGE/status
     ultrapossum_setconf_shell $localstatedir/lib/$PACKAGE/status $2 "$3"
   else
     case "$ULTRAPOSSUM_CONFIG_BACKEND" in
-      ldap)
-        ldapmodify -x -H "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_URI" -D "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDDN" -w "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDPW" > /dev/null <<EOF
-dn: cn=$2,$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BASEDN
-changetype: modify
-replace: description
-description: $3
-EOF
-       ;;
-      *)
+      ldap|*)
         if test "x$1" = "x."; then
           config=$SYSCONFDIR/ultrapossum.cf
         elif test "x$1" = "xsecret"; then
@@ -66,7 +57,6 @@
 
 # ultrapossum_setconf <path> <name> <val>
 ultrapossum_setconf_shell() {
-
   config=$1
   val=$3
   tmpsetconf=`tempfile`
@@ -79,22 +69,12 @@
     echo "$2=\"$val\"" >> $tmpsetconf
   fi
   /bin/mv $tmpsetconf $config
-
 }
 
 # ultrapossum_removeconf <category> <var>
 ultrapossum_removeconf() {
   case "$ULTRAPOSSUM_CONFIG_BACKEND" in
-    ldap)
-      if test "x${!2}" != "x"; then
-        ldapmodify -x -H "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_URI" -D "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDDN" -w "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDPW" > /dev/null <<EOF
-dn: cn=$2,$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BASEDN
-changetype: modify
-delete: description
-EOF
-      fi
-    ;;
-    *)
+    ldap|*)
       ultrapossum_removeconf_shell "$1" "$2"
     ;;
   esac
@@ -128,9 +108,7 @@
   fi
 
   case "$ULTRAPOSSUM_CONFIG_BACKEND" in
-    ldap)
-    ;;
-    *)
+    ldap|*)
       ultrapossum_parse_config_shell "$MODULECONFDIR/$1.cf"
     ;;
   esac
@@ -168,7 +146,8 @@
     if test "x$cache" != "x" && test -f "$CACHEDIR/$cache"; then
       grep -v '#' "$CACHEDIR/$cache" | sed 's/^\([^=]*\)=.*"/\1/'
     else
-      ldapsearch -LLL -x -H "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_URI" -b "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BASEDN" -D "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDDN" -w "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDPW" objectClass=\* cn  | egrep cn: | cut -d' ' -f2-
+      ( ldapsearch -LLL -x -H "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_URI" -b "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BASEDN" -D "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDDN" -w "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDPW" objectClass=\* cn  | egrep cn: | cut -d' ' -f2-
+      getvariable_shell $modules ) | sort | uniq
     fi
     ;;
   *)
===================================================================
RCS file: ultrapossum/init.d/15variable,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ultrapossum/init.d/15variable	2004/09/17 12:52:41	1.5
+++ ultrapossum/init.d/15variable	2004/09/24 03:46:08	1.6
@@ -19,16 +19,8 @@
   . $CACHEDIR/$cache
 fi ## cache
 
-# move to config backend framework?
-case "$ULTRAPOSSUM_CONFIG_BACKEND" in
-  ldap)
-   :
-  ;;
-  *)
-    eval "`ultrapossum_parse_config_shell "$ULTRAPOSSUMCF"`"
-    eval "`ultrapossum_parse_config_shell "$SYSCONFDIR/secret.cf" 2> /dev/null`"
-  ;;
-esac
+eval "`ultrapossum_parse_config_shell "$ULTRAPOSSUMCF"`"
+eval "`ultrapossum_parse_config_shell "$SYSCONFDIR/secret.cf" 2> /dev/null`"
 
 if test -d $APPSCONFDIR; then
   for f in `find $APPSCONFDIR -name '*.cf'`


From taru ¡÷ users.sourceforge.jp  Fri Sep 24 12:46:35 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 24 Sep 2004 12:46:35 +0900
Subject: [Ultrapossum-cvs 548] ultrapossum/debian 1.56,1.57,changelog
Message-ID: <20040924034635.F30A62AC029@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/changelog,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- ultrapossum/debian/changelog	2004/09/23 06:29:33	1.56
+++ ultrapossum/debian/changelog	2004/09/24 03:46:35	1.57
@@ -1,3 +1,10 @@
+ultrapossum (0.1beta10-0pre3) unstable; urgency=low
+
+  * Applied the latest upstream version.
+   - LDAP backend uses LDAP only for default values.
+
+ -- Masato Taruishi <taru ¡÷ valinux.co.jp>  Fri, 24 Sep 2004 12:44:34 +0900
+
 ultrapossum (0.1beta10-0pre2) unstable; urgency=low
 
   * Applied the latest upstream version.


From taru ¡÷ users.sourceforge.jp  Fri Sep 24 13:26:12 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 24 Sep 2004 13:26:12 +0900
Subject: [Ultrapossum-cvs 549] ultrapossum/debian 1.12, 1.13,
	ultrapossum-common.postinst
Message-ID: <20040924042612.833B62AC029@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/ultrapossum-common.postinst,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ultrapossum/debian/ultrapossum-common.postinst	2004/09/24 03:46:07	1.12
+++ ultrapossum/debian/ultrapossum-common.postinst	2004/09/24 04:26:12	1.13
@@ -83,6 +83,8 @@
 
 	set_config_backend
 	
+        db_get ultrapossum-common/config_backend
+        backend="$RET"
         case "$backend" in
 	  ldap)
 	  ;;


From taru ¡÷ users.sourceforge.jp  Fri Sep 24 13:34:54 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 24 Sep 2004 13:34:54 +0900
Subject: [Ultrapossum-cvs 550] ultrapossum/debian 1.10, 1.11,
	ultrapossum-common.config
Message-ID: <20040924043454.DFD952AC029@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/ultrapossum-common.config,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ultrapossum/debian/ultrapossum-common.config	2004/09/20 03:01:36	1.10
+++ ultrapossum/debian/ultrapossum-common.config	2004/09/24 04:34:54	1.11
@@ -30,7 +30,11 @@
 else
   # initial preconfiguration should come here
   ORGANIZATION="`hostname`"
+  SUFFIX="o=ultrapossum"
+  ROOTDN="cn=admin,$SUFFIX"
   ULTRAPOSSUM_CONFIG_BACKEND_LDAP_URI="ldap://$ORGANIZATION/"
+  ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BASEDN="ou=config,$SUFFIX"
+  ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDDN="$ROOTDN"
   if test -f "/etc/ultrapossum/config.cf"; then
     . /etc/ultrapossum/config.cf
   fi


From taru ¡÷ users.sourceforge.jp  Fri Sep 24 13:34:55 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 24 Sep 2004 13:34:55 +0900
Subject: [Ultrapossum-cvs 551] ultrapossum/debian/po 1.13, 1.14, ja.po 1.12,
	1.13, templates.pot
Message-ID: <20040924043455.0BAC02AC063@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/po/ja.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ultrapossum/debian/po/ja.po	2004/09/20 03:01:37	1.13
+++ ultrapossum/debian/po/ja.po	2004/09/24 04:34:54	1.14
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: ultrapossum 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-20 11:52+0900\n"
+"POT-Creation-Date: 2004-09-24 13:32+0900\n"
 "PO-Revision-Date: 2004-04-01 19:41+0900\n"
 "Last-Translator: Masato Taruishi <taru ¡÷ debian.org>\n"
 "Language-Team: Japanese <taru ¡÷ valinux.co.jp>\n"
@@ -35,32 +35,34 @@
 msgid ""
 "UltraPossum stores your configuration in a configuration backend. You can "
 "select the backend to use. In most of cases, the backend 'file' is the best "
-"choice. This backend holds configurations as file. If you want to share "
-"configurations with ultrapossum servers, then you may want to select ldap "
-"backend. This backend holds them in LDAP directory."
+"choice. This backend holds configurations as file in shell fragment. If you "
+"want to share configurations between ultrapossum servers, then you may want "
+"to select ldap backend. This backend retrieves default configurations from "
+"LDAP directory. You can overwrite every configuartion by the same way as the "
+"file backend."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../ultrapossum-common.templates:15
+#: ../ultrapossum-common.templates:16
 msgid "Password of the root DN"
 msgstr "¥ë¡¼¥ÈDN¤Î¥Ñ¥¹¥ï¡¼¥É"
 
 #. Type: password
 #. Description
-#: ../ultrapossum-common.templates:15
+#: ../ultrapossum-common.templates:16
 msgid "Specify the password of the root DN."
 msgstr "¥ë¡¼¥ÈDN¤Î¥Ñ¥¹¥ï¡¼¥É¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£"
 
 #. Type: password
 #. Description
-#: ../ultrapossum-common.templates:20
+#: ../ultrapossum-common.templates:21
 msgid "Retype password of the root DN"
 msgstr "¥ë¡¼¥ÈDN¤Î¥Ñ¥¹¥ï¡¼¥É(³Îǧ)"
 
 #. Type: password
 #. Description
-#: ../ultrapossum-common.templates:20
+#: ../ultrapossum-common.templates:21
 msgid ""
 "In order to check whether your password is correct, retype the same password "
 "again."
@@ -68,70 +70,70 @@
 
 #. Type: note
 #. Description
-#: ../ultrapossum-common.templates:26
+#: ../ultrapossum-common.templates:27
 msgid "password miss match"
 msgstr "¥Ñ¥¹¥ï¡¼¥É¤¬°ìÃפ·¤Þ¤»¤ó"
 
 #. Type: note
 #. Description
-#: ../ultrapossum-common.templates:26
+#: ../ultrapossum-common.templates:27
 msgid "Your password is different. Retype the password again."
 msgstr "¥Ñ¥¹¥ï¡¼¥É¤¬°Û¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£¤â¤¦°ìÅ٥ѥ¹¥ï¡¼¥É¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£"
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:31
+#: ../ultrapossum-common.templates:32
 msgid "LDAP URI where you connect"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:36
+#: ../ultrapossum-common.templates:37
 msgid "BaseDN to search"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:41
+#: ../ultrapossum-common.templates:42
 msgid "BindDN to search"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../ultrapossum-common.templates:45
+#: ../ultrapossum-common.templates:46
 #, fuzzy
 msgid "password to search"
 msgstr "¥Ñ¥¹¥ï¡¼¥É¤¬°ìÃפ·¤Þ¤»¤ó"
 
 #. Type: password
 #. Description
-#: ../ultrapossum-common.templates:49
+#: ../ultrapossum-common.templates:50
 #, fuzzy
 msgid "retype password to search"
 msgstr "¥ë¡¼¥ÈDN¤Î¥Ñ¥¹¥ï¡¼¥É(³Îǧ)"
 
 #. Type: Note
 #. Description
-#: ../ultrapossum-common.templates:53
+#: ../ultrapossum-common.templates:54
 #, fuzzy
 msgid "password mismatch"
 msgstr "¥Ñ¥¹¥ï¡¼¥É¤¬°ìÃפ·¤Þ¤»¤ó"
 
 #. Type: Note
 #. Description
-#: ../ultrapossum-common.templates:57
+#: ../ultrapossum-common.templates:58
 msgid "Configuration not found there"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:62
+#: ../ultrapossum-common.templates:63
 msgid "Top level DN (Distungnished Name)"
 msgstr "ºÇ¾å°Ì DN (¼±ÊÌ̾)"
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:62
+#: ../ultrapossum-common.templates:63
 msgid ""
 "In LDAP, every entry has the unique identifier called DN (Distungnished "
 "Name). Because DN is tree structure, you need to specify the root entry "
@@ -140,13 +142,13 @@
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:69
+#: ../ultrapossum-common.templates:70
 msgid "Which organization do you want to join?"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:69
+#: ../ultrapossum-common.templates:70
 msgid ""
 " Organization is domain of UltraPossum configuartion.\n"
 " Configurations of all servers in a domain are shared."
@@ -154,19 +156,19 @@
 
 #. Type: boolean
 #. Description
-#: ../ultrapossum-common.templates:76
+#: ../ultrapossum-common.templates:77
 msgid "Your configuration is invalid. Continue to configure?"
 msgstr "ÀßÄ̵꤬¸ú¤Ç¤¹¡£ÀßÄê¤ò·Ñ³¤·¤Þ¤¹¤«?"
 
 #. Type: boolean
 #. Description
-#: ../ultrapossum-common.templates:76
+#: ../ultrapossum-common.templates:77
 msgid " ${description}"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../ultrapossum-common.templates:76
+#: ../ultrapossum-common.templates:77
 msgid ""
 "If you keep this configuration, ultrapossum probably will not work "
 "correctly. You can reconfigure it again instead of continuing to configure."
===================================================================
RCS file: ultrapossum/debian/po/templates.pot,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ultrapossum/debian/po/templates.pot	2004/09/20 03:01:37	1.12
+++ ultrapossum/debian/po/templates.pot	2004/09/24 04:34:54	1.13
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-20 11:52+0900\n"
+"POT-Creation-Date: 2004-09-24 13:32+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL ¡÷ ADDRESS>\n"
 "Language-Team: LANGUAGE <LL ¡÷ li.org>\n"
@@ -36,32 +36,34 @@
 msgid ""
 "UltraPossum stores your configuration in a configuration backend. You can "
 "select the backend to use. In most of cases, the backend 'file' is the best "
-"choice. This backend holds configurations as file. If you want to share "
-"configurations with ultrapossum servers, then you may want to select ldap "
-"backend. This backend holds them in LDAP directory."
+"choice. This backend holds configurations as file in shell fragment. If you "
+"want to share configurations between ultrapossum servers, then you may want "
+"to select ldap backend. This backend retrieves default configurations from "
+"LDAP directory. You can overwrite every configuartion by the same way as the "
+"file backend."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../ultrapossum-common.templates:15
+#: ../ultrapossum-common.templates:16
 msgid "Password of the root DN"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../ultrapossum-common.templates:15
+#: ../ultrapossum-common.templates:16
 msgid "Specify the password of the root DN."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../ultrapossum-common.templates:20
+#: ../ultrapossum-common.templates:21
 msgid "Retype password of the root DN"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../ultrapossum-common.templates:20
+#: ../ultrapossum-common.templates:21
 msgid ""
 "In order to check whether your password is correct, retype the same password "
 "again."
@@ -69,67 +71,67 @@
 
 #. Type: note
 #. Description
-#: ../ultrapossum-common.templates:26
+#: ../ultrapossum-common.templates:27
 msgid "password miss match"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../ultrapossum-common.templates:26
+#: ../ultrapossum-common.templates:27
 msgid "Your password is different. Retype the password again."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:31
+#: ../ultrapossum-common.templates:32
 msgid "LDAP URI where you connect"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:36
+#: ../ultrapossum-common.templates:37
 msgid "BaseDN to search"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:41
+#: ../ultrapossum-common.templates:42
 msgid "BindDN to search"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../ultrapossum-common.templates:45
+#: ../ultrapossum-common.templates:46
 msgid "password to search"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../ultrapossum-common.templates:49
+#: ../ultrapossum-common.templates:50
 msgid "retype password to search"
 msgstr ""
 
 #. Type: Note
 #. Description
-#: ../ultrapossum-common.templates:53
+#: ../ultrapossum-common.templates:54
 msgid "password mismatch"
 msgstr ""
 
 #. Type: Note
 #. Description
-#: ../ultrapossum-common.templates:57
+#: ../ultrapossum-common.templates:58
 msgid "Configuration not found there"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:62
+#: ../ultrapossum-common.templates:63
 msgid "Top level DN (Distungnished Name)"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:62
+#: ../ultrapossum-common.templates:63
 msgid ""
 "In LDAP, every entry has the unique identifier called DN (Distungnished "
 "Name). Because DN is tree structure, you need to specify the root entry "
@@ -138,13 +140,13 @@
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:69
+#: ../ultrapossum-common.templates:70
 msgid "Which organization do you want to join?"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../ultrapossum-common.templates:69
+#: ../ultrapossum-common.templates:70
 msgid ""
 " Organization is domain of UltraPossum configuartion.\n"
 " Configurations of all servers in a domain are shared."
@@ -152,19 +154,19 @@
 
 #. Type: boolean
 #. Description
-#: ../ultrapossum-common.templates:76
+#: ../ultrapossum-common.templates:77
 msgid "Your configuration is invalid. Continue to configure?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../ultrapossum-common.templates:76
+#: ../ultrapossum-common.templates:77
 msgid " ${description}"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../ultrapossum-common.templates:76
+#: ../ultrapossum-common.templates:77
 msgid ""
 "If you keep this configuration, ultrapossum probably will not work "
 "correctly. You can reconfigure it again instead of continuing to configure."


From taru ¡÷ users.sourceforge.jp  Fri Sep 24 22:02:03 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 24 Sep 2004 22:02:03 +0900
Subject: [Ultrapossum-cvs 551] plugin/slapd 1.2,1.3,configure.in
Message-ID: <20040924130203.49E792AC086@users.sourceforge.jp>

===================================================================
RCS file: plugin/slapd/configure.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin/slapd/configure.in	2004/09/15 08:18:21	1.2
+++ plugin/slapd/configure.in	2004/09/24 13:02:03	1.3
@@ -2,8 +2,8 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.50)
-AC_INIT(ultrapossum-slapd, 0.0.1+2.2.14sb1, taru ¡÷ ultrapossum.org)
-AM_INIT_AUTOMAKE(ultrapossum-slapd, 0.0.1+2.2.14sb1)
+AC_INIT(ultrapossum-slapd, 0.0.1+2.2.17sb1, taru ¡÷ ultrapossum.org)
+AM_INIT_AUTOMAKE(ultrapossum-slapd, 0.0.1+2.2.17sb1)
 
 # Checks for programs.
 AC_PROG_LN_S


From taru ¡÷ users.sourceforge.jp  Fri Sep 24 22:02:03 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 24 Sep 2004 22:02:03 +0900
Subject: [Ultrapossum-cvs 552] plugin/slapd/debian 1.3,1.4,changelog
Message-ID: <20040924130203.6485F2AC08B@users.sourceforge.jp>

===================================================================
RCS file: plugin/slapd/debian/changelog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin/slapd/debian/changelog	2004/08/27 09:26:05	1.3
+++ plugin/slapd/debian/changelog	2004/09/24 13:02:03	1.4
@@ -1,3 +1,9 @@
+ultrapossum-slapd (0.0.1+2.2.17sb1-0pre1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Masato Taruishi <taru ¡÷ valinux.co.jp>  Fri, 24 Sep 2004 21:59:36 +0900
+
 ultrapossum-slapd (0.0.1+2.2.14sb1-0pre1) unstable; urgency=low
 
   * Initial Release.


From taru ¡÷ users.sourceforge.jp  Fri Sep 24 22:02:04 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 24 Sep 2004 22:02:04 +0900
Subject: [Ultrapossum-cvs 553] plugin/slapd/upstream ...
Message-ID: <20040924130204.481B12AC086@users.sourceforge.jp>

===================================================================
RCS file: plugin/slapd/upstream/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin/slapd/upstream/Makefile.am	2004/09/16 04:21:37	1.4
+++ plugin/slapd/upstream/Makefile.am	2004/09/24 13:02:03	1.5
@@ -1,5 +1,5 @@
 
-OPENLDAP_VERSION = 2.2.14
+OPENLDAP_VERSION := 2.2.17
 
 include ../ultrapossum.am
 


From taru ¡÷ users.sourceforge.jp  Fri Sep 24 22:38:04 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 24 Sep 2004 22:38:04 +0900
Subject: [Ultrapossum-cvs 553] ultrapossum 1.44,1.45,configure.in
Message-ID: <20040924133804.EEA142AC034@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/configure.in,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ultrapossum/configure.in	2004/09/22 10:33:40	1.44
+++ ultrapossum/configure.in	2004/09/24 13:38:04	1.45
@@ -77,7 +77,7 @@
 
 AC_SUBST(aclocaldir)
 
-ldaplistenport=ldap
+ldaplistenport=389
 AC_ARG_WITH(ldaplistenport,
 [  --with-ldaplistenport=PORT change default listening port for LDAP],
 [case "$withval" in


From taru ¡÷ users.sourceforge.jp  Fri Sep 24 23:05:56 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 24 Sep 2004 23:05:56 +0900
Subject: [Ultrapossum-cvs 554] ultrapossum 1.45,1.46,configure.in
Message-ID: <20040924140556.E17C32AC034@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/configure.in,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ultrapossum/configure.in	2004/09/24 13:38:04	1.45
+++ ultrapossum/configure.in	2004/09/24 14:05:56	1.46
@@ -77,7 +77,7 @@
 
 AC_SUBST(aclocaldir)
 
-ldaplistenport=389
+ldaplistenport=
 AC_ARG_WITH(ldaplistenport,
 [  --with-ldaplistenport=PORT change default listening port for LDAP],
 [case "$withval" in
@@ -88,7 +88,7 @@
 ])dnl
 AC_SUBST(ldaplistenport)
 
-ldapslistenport=ldaps
+ldapslistenport=
 AC_ARG_WITH(ldapslistenport,
 [  --with-ldapslistenport=PORT change default listening port for LDAP over SSL],
 [case "$withval" in


From taru ¡÷ users.sourceforge.jp  Fri Sep 24 23:05:57 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 24 Sep 2004 23:05:57 +0900
Subject: [Ultrapossum-cvs 555] ultrapossum/module/server 1.16, 1.17,
	10server 1.22, 1.23, 2.0
Message-ID: <20040924140557.0F3E32AC037@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/server/10server,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ultrapossum/module/server/10server	2004/09/23 08:29:36	1.16
+++ ultrapossum/module/server/10server	2004/09/24 14:05:56	1.17
@@ -86,7 +86,11 @@
 CHROOTEXTRAFILES=`ultrapossum_getconf CHROOTEXTRAFILES ""`
 
 LDAPLISTENPORT=`ultrapossum_getconf LDAPLISTENPORT "$ldaplistenport"`
-LDAPURILIST=`ultrapossum_getconf LDAPURILIST ldap://:$LDAPLISTENPORT/`
+if test "x$LDAPLISTENPORT" != "x"; then
+  LDAPURILIST=`ultrapossum_getconf LDAPURILIST ldap://:$LDAPLISTENPORT/`
+else
+  LDAPURILIST=`ultrapossum_getconf LDAPURILIST "ldap:///"`
+fi
 
 MASTER=`ultrapossum_getconf MASTER $LDAPMASTER`
 SLAPD_VERSION=$(ultrapossum_getconf SLAPD_VERSION `strings $SLAPD 2> /dev/null | grep OpenLDAP: | sed -e 's/.*slapd \([^ ]*\).*$/\1/'`)
===================================================================
RCS file: ultrapossum/module/server/2.0,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ultrapossum/module/server/2.0	2004/09/22 06:32:54	1.22
+++ ultrapossum/module/server/2.0	2004/09/24 14:05:56	1.23
@@ -41,7 +41,7 @@
     dbrecover
 
     # now we will attempt to start as a master
-    if ! $SLAPD -h "$SLAPDURILIST" -f $SLAPDMASTERCONF $SLAPD_EXTRA_ARGS; then
+    if ! $SLAPD -h "$SLAPDURILIST"  -f $SLAPDMASTERCONF $SLAPD_EXTRA_ARGS; then
       echo "E: $SLAPD abnormally exits. Probably you can see the error by syslog" 1>&2
       return 1
     fi


From taru ¡÷ users.sourceforge.jp  Fri Sep 24 23:05:57 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 24 Sep 2004 23:05:57 +0900
Subject: [Ultrapossum-cvs 556] ultrapossum/module/startTLS 1.1,1.2,11startTLS
Message-ID: <20040924140557.313222AC086@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/startTLS/11startTLS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ultrapossum/module/startTLS/11startTLS	2004/06/24 08:43:02	1.1
+++ ultrapossum/module/startTLS/11startTLS	2004/09/24 14:05:57	1.2
@@ -66,14 +66,20 @@
 
 # URIs to accept
 LDAPSLISTENPORT=$(ultrapossum_getconf LDAPSLISTENPORT "$ldapslistenport")
-LDAPSURILIST=$(ultrapossum_getconf LDAPSURILIST ldaps://:$LDAPSLISTENPORT/)
+if test "x$LDAPSLISTENPORT" != "x"; then
+  LDAPSURILIST=$(ultrapossum_getconf LDAPSURILIST ldaps://:$LDAPSLISTENPORT/)
+else
+  LDAPSURILIST=$(ultrapossum_getconf LDAPSURILIST "ldaps:///")
+fi
 
 fi #cache
 
 eval "`ultrapossum_parse_config startTLS`"
 
 if test "x$ULTRAPOSSUM_MODULE_STARTTLS" = "xinstalled"; then
-  SLAPDURILIST="$SLAPDURILIST $LDAPSURILIST"
+  if test "x$LDAPSURILIST" != "x"; then
+    SLAPDURILIST="$SLAPDURILIST $LDAPSURILIST"
+  fi
   CHROOTFILES="$CHROOTFILES $TLSCERTIFICATEFILE $TLSCERTIFICATEKEYFILE"
 fi
 


From taru ¡÷ users.sourceforge.jp  Fri Sep 24 23:06:47 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 24 Sep 2004 23:06:47 +0900
Subject: [Ultrapossum-cvs 557] ultrapossum/debian 1.57,1.58,changelog
Message-ID: <20040924140647.D97262AC034@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/changelog,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- ultrapossum/debian/changelog	2004/09/24 03:46:35	1.57
+++ ultrapossum/debian/changelog	2004/09/24 14:06:47	1.58
@@ -1,3 +1,9 @@
+ultrapossum (0.1beta10-0pre4) unstable; urgency=low
+
+  * Applied the latest upstream version.
+
+ -- Masato Taruishi <taru ¡÷ valinux.co.jp>  Fri, 24 Sep 2004 23:05:00 +0900
+
 ultrapossum (0.1beta10-0pre3) unstable; urgency=low
 
   * Applied the latest upstream version.


From taru ¡÷ users.sourceforge.jp  Fri Sep 24 23:12:29 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 24 Sep 2004 23:12:29 +0900
Subject: [Ultrapossum-cvs 558] ultrapossum 1.46,1.47,configure.in
Message-ID: <20040924141229.CB6FD2AC034@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/configure.in,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- ultrapossum/configure.in	2004/09/24 14:05:56	1.46
+++ ultrapossum/configure.in	2004/09/24 14:12:29	1.47
@@ -4,8 +4,8 @@
 # $Id$
 
 AC_PREREQ(2.50)
-AC_INIT(ultrapossum, 0.1beta10, taru ¡÷ ultrapossum.org)
-AM_INIT_AUTOMAKE(ultrapossum, 0.1beta10)
+AC_INIT(ultrapossum, 0.1beta11, taru ¡÷ ultrapossum.org)
+AM_INIT_AUTOMAKE(ultrapossum, 0.1beta11)
 
 # Checks for programs.
 AC_PROG_INSTALL


From taru ¡÷ users.sourceforge.jp  Fri Sep 24 23:15:40 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Fri, 24 Sep 2004 23:15:40 +0900
Subject: [Ultrapossum-cvs 559] ultrapossum/debian 1.58,1.59,changelog
Message-ID: <20040924141540.486752AC034@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/changelog,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- ultrapossum/debian/changelog	2004/09/24 14:06:47	1.58
+++ ultrapossum/debian/changelog	2004/09/24 14:15:40	1.59
@@ -1,3 +1,9 @@
+ultrapossum (0.1beta11-0pre1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Masato Taruishi <taru ¡÷ valinux.co.jp>  Fri, 24 Sep 2004 23:13:45 +0900
+
 ultrapossum (0.1beta10-0pre4) unstable; urgency=low
 
   * Applied the latest upstream version.


From taru ¡÷ users.sourceforge.jp  Sat Sep 25 02:07:03 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Sat, 25 Sep 2004 02:07:03 +0900
Subject: [Ultrapossum-cvs 560] ultrapossum/debian ...
Message-ID: <20040924170703.B1B1F2AC036@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/ultrapossum-failover.config,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ultrapossum/debian/ultrapossum-failover.config	2004/09/17 02:53:23	1.5
+++ ultrapossum/debian/ultrapossum-failover.config	2004/09/24 17:07:03	1.6
@@ -6,7 +6,7 @@
 
 db_version 2.0
 
-if test -x "/usr/bin/ultrapossum-config"; then
+if test -x "/usr/share/ultrapossum/update.d/update-failover"; then
   eval `/usr/bin/ultrapossum-config init`
   trap "eval `ultrapossum-config term`" 0
 else
===================================================================
RCS file: ultrapossum/debian/ultrapossum-server.config,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ultrapossum/debian/ultrapossum-server.config	2004/09/20 03:01:36	1.23
+++ ultrapossum/debian/ultrapossum-server.config	2004/09/24 17:07:03	1.24
@@ -12,7 +12,7 @@
 trap "/bin/rm -f $tmp" 0
 chmod 600 $tmp
 
-if test -x "/usr/bin/ultrapossum-config"; then
+if test -x "/usr/share/ultrapossum/update.d/update-server"; then
   eval `/usr/bin/ultrapossum-config init`
   trap "/bin/rm -f $tmp; eval `ultrapossum-config term`" 0
 else
===================================================================
RCS file: ultrapossum/debian/ultrapossum-tls.config,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ultrapossum/debian/ultrapossum-tls.config	2004/09/16 18:30:12	1.5
+++ ultrapossum/debian/ultrapossum-tls.config	2004/09/24 17:07:03	1.6
@@ -12,7 +12,7 @@
 trap "/bin/rm -f $tmp" 0
 chmod 600 $tmp
 
-if test -x "/usr/bin/ultrapossum-config"; then
+if test -x "/usr/share/ultrapossum/update.d/update-startTLS"; then
   eval `/usr/bin/ultrapossum-config init`
   trap "/bin/rm -f $tmp; eval `ultrapossum-config term`" 0
 else


From taru ¡÷ users.sourceforge.jp  Sat Sep 25 02:16:18 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Sat, 25 Sep 2004 02:16:18 +0900
Subject: [Ultrapossum-cvs 561] ultrapossum/debian 1.59,1.60,changelog
Message-ID: <20040924171618.96AC52AC04B@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/changelog,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- ultrapossum/debian/changelog	2004/09/24 14:15:40	1.59
+++ ultrapossum/debian/changelog	2004/09/24 17:16:18	1.60
@@ -1,3 +1,9 @@
+ultrapossum (0.1beta11-0pre2) unstable; urgency=low
+
+  * Fixed initial installation detection in .config.
+
+ -- Masato Taruishi <taru ¡÷ valinux.co.jp>  Sat, 25 Sep 2004 02:14:18 +0900
+
 ultrapossum (0.1beta11-0pre1) unstable; urgency=low
 
   * New upstream release.


From taru ¡÷ users.sourceforge.jp  Sat Sep 25 11:49:26 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Sat, 25 Sep 2004 11:49:26 +0900
Subject: [Ultrapossum-cvs 562] ultrapossum/module/failover 1.12, 1.13,
	update-failover
Message-ID: <20040925024926.0DDC22AC021@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/failover/update-failover,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ultrapossum/module/failover/update-failover	2004/09/17 02:53:23	1.12
+++ ultrapossum/module/failover/update-failover	2004/09/25 02:49:25	1.13
@@ -115,8 +115,12 @@
 sanity_check() {
   sanity_error=0
   if test "x$TYPE" = "xmaster" && test "x$BACKUP" != "x"; then
-    if ! test -f "/etc/init.d/heartbeat"; then
-      echo "E: In order to use failover environment, need /etc/init.d/heartbeat" 1>&2
+    if ! test -x "/etc/init.d/heartbeat"; then
+      echo "E: No /etc/init.d/heartbeat found" 1>&2
+      exit 1
+    fi
+    if ! test -x "/etc/init.d/mon"; then
+      echo "E: No /etc/init.d/mon found" 1>&2
       exit 1
     fi
     if ! include "$BACKUP" "$SLAVES"; then


From taru ¡÷ users.sourceforge.jp  Sat Sep 25 11:49:26 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Sat, 25 Sep 2004 11:49:26 +0900
Subject: [Ultrapossum-cvs 563] ultrapossum/module/failover/heartbeat ...
Message-ID: <20040925024926.3149A2AC08B@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/failover/heartbeat/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ultrapossum/module/failover/heartbeat/Makefile.am	2004/03/13 14:25:54	1.1.1.1
+++ ultrapossum/module/failover/heartbeat/Makefile.am	2004/09/25 02:49:26	1.2
@@ -1,6 +1,6 @@
 hascriptsdir = @hasysconfdir@/resource.d/
 
-RESOURCES = ldap syncbackup
+RESOURCES = ldap syncbackup mon
 
 install-exec-local:
 	$(mkinstalldirs) $(DESTDIR)/$(hascriptsdir)/


From taru ¡÷ users.sourceforge.jp  Sat Sep 25 11:53:36 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Sat, 25 Sep 2004 11:53:36 +0900
Subject: [Ultrapossum-cvs 564] ultrapossum/module/failover 1.13, 1.14,
	update-failover
Message-ID: <20040925025336.6FD652AC08B@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/failover/update-failover,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ultrapossum/module/failover/update-failover	2004/09/25 02:49:25	1.13
+++ ultrapossum/module/failover/update-failover	2004/09/25 02:53:36	1.14
@@ -151,7 +151,7 @@
     else
       progress "Installing New version of authkeys... "
       cp /dev/null $AUTHKEYS
-      chmod 640 $AUTHKEYS
+      chmod 600 $AUTHKEYS
       $MODULEDIR/failover/authkeys.sh > $AUTHKEYS
       progress "Installing New version of authkeys... done"
     fi


From taru ¡÷ users.sourceforge.jp  Sat Sep 25 11:55:27 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Sat, 25 Sep 2004 11:55:27 +0900
Subject: [Ultrapossum-cvs 565] ultrapossum/module/failover 1.4,1.5,ha.cf.sh
Message-ID: <20040925025527.4244C2AC021@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/failover/ha.cf.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ultrapossum/module/failover/ha.cf.sh	2004/09/22 12:31:11	1.4
+++ ultrapossum/module/failover/ha.cf.sh	2004/09/25 02:55:27	1.5
@@ -22,6 +22,7 @@
 eval `ultrapossum-config init`
 
 # System level default
+#debugfile="/var/log/ha-debug"
 #logfile="/var/log/ha-log"
 #logfacility="local0"
 #keepalive="2"
@@ -34,6 +35,8 @@
 #udp="eth0"
 #mcast="eth0 225.0.0.1 694 1 1"
 #watchdog="/dev/watchdog"
+#nice_failback=""
+#auto_failback=""
 
 if test -f $SYSCONFDIR/default.cf; then
   source_shell $SYSCONFDIR/default.cf
@@ -43,7 +46,7 @@
   source_shell default.cf
 fi
 
-SUPPORTED_DIRECTIVE="logfile logfacility keepalive deadtime initdead hopfudge serial baud udpport udp mcast watchdog nice_failback"
+SUPPORTED_DIRECTIVE="debugfile logfile logfacility keepalive deadtime initdead hopfudge serial baud udpport udp mcast watchdog nice_failback auto_failback"
 HACFIN=$TEMPLATEDIR/ha.cf.in
 if test -f "ha.cf.in"; then
   HACFIN=ha.cf.in


From taru ¡÷ users.sourceforge.jp  Sat Sep 25 11:56:37 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Sat, 25 Sep 2004 11:56:37 +0900
Subject: [Ultrapossum-cvs 566] ultrapossum 1.3,1.4,default.cf
Message-ID: <20040925025637.ABFC32AC021@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/default.cf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ultrapossum/default.cf	2004/04/20 17:44:31	1.3
+++ ultrapossum/default.cf	2004/09/25 02:56:37	1.4
@@ -41,6 +41,7 @@
 #mcast="eth0 225.0.0.1 694 1 1"
 #watchdog="/dev/watchdog"
 #nice_failback="off"
+#auto_failback="on"
 
 ##
 ## authkeys default configuration


From taru ¡÷ users.sourceforge.jp  Sat Sep 25 11:56:37 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Sat, 25 Sep 2004 11:56:37 +0900
Subject: [Ultrapossum-cvs 567] ultrapossum/module/failover 1.5,1.6,ha.cf.sh
Message-ID: <20040925025637.C38412AC08B@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/failover/ha.cf.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ultrapossum/module/failover/ha.cf.sh	2004/09/25 02:55:27	1.5
+++ ultrapossum/module/failover/ha.cf.sh	2004/09/25 02:56:37	1.6
@@ -35,8 +35,8 @@
 #udp="eth0"
 #mcast="eth0 225.0.0.1 694 1 1"
 #watchdog="/dev/watchdog"
-#nice_failback=""
-#auto_failback=""
+#nice_failback="off"
+#auto_failback="on"
 
 if test -f $SYSCONFDIR/default.cf; then
   source_shell $SYSCONFDIR/default.cf


From taru ¡÷ users.sourceforge.jp  Sat Sep 25 12:06:01 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Sat, 25 Sep 2004 12:06:01 +0900
Subject: [Ultrapossum-cvs 568] ultrapossum/debian 1.11, 1.12,
	ultrapossum-failover.postinst
Message-ID: <20040925030601.C76642AC021@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/ultrapossum-failover.postinst,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ultrapossum/debian/ultrapossum-failover.postinst	2004/09/24 03:46:07	1.11
+++ ultrapossum/debian/ultrapossum-failover.postinst	2004/09/25 03:06:01	1.12
@@ -50,7 +50,7 @@
 	  ucf /usr/share/ultrapossum/ucf/ultrapossum/$f /etc/ultrapossum/$f
 	done
 
-	for f in resource.d/syncbackup resource.d/ldap
+	for f in resource.d/mon resource.d/syncbackup resource.d/ldap
 	do
 	  ucf /usr/share/ultrapossum/ucf/ha.d/$f /etc/ha.d/$f
 	done


From taru ¡÷ users.sourceforge.jp  Sat Sep 25 12:11:38 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Sat, 25 Sep 2004 12:11:38 +0900
Subject: [Ultrapossum-cvs 569] ultrapossum/module/server 1.11,1.12,sshman
Message-ID: <20040925031138.E2A6B2AC021@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/server/sshman,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ultrapossum/module/server/sshman	2004/09/22 06:38:56	1.11
+++ ultrapossum/module/server/sshman	2004/09/25 03:11:38	1.12
@@ -69,7 +69,10 @@
     fi
     cmd "$2" "$3"
     ;;
-  *)
+  x)
+    echo "Usage: $0 keygen <cmd>|auth|unauth|cmd <host> <cmd>" 1>&2
+    ;;
+  x*)
     echo "Unknown argument: $1" 1>&2
     exit 1
     ;;


From taru ¡÷ users.sourceforge.jp  Sat Sep 25 14:18:04 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Sat, 25 Sep 2004 14:18:04 +0900
Subject: [Ultrapossum-cvs 570] ultrapossum/module/server 1.12,1.13,sshman
Message-ID: <20040925051804.974482AC020@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/server/sshman,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ultrapossum/module/server/sshman	2004/09/25 03:11:38	1.12
+++ ultrapossum/module/server/sshman	2004/09/25 05:18:04	1.13
@@ -19,10 +19,14 @@
   fi
 }
 
+list() {
+  /bin/ls $SSHKEYDIR
+}
+
 auth() {
   add_startmark "##" "SERVER" > $tmp
   echo -n "Registering ssh permissions..." 1>&2
-  /bin/ls $SSHKEYDIR | while read cmd
+  list | while read cmd
   do
     if test -f $SSHKEYDIR/$cmd/id_rsa.pub; then
       echo -n " $cmd" 1>&2
@@ -56,6 +60,9 @@
     fi
     keygen "$2"
     ;;
+  xlist)
+    list
+    ;;
   xauth)
     auth
     ;;
@@ -70,7 +77,7 @@
     cmd "$2" "$3"
     ;;
   x)
-    echo "Usage: $0 keygen <cmd>|auth|unauth|cmd <host> <cmd>" 1>&2
+    echo "Usage: $0 keygen <cmd>|list|auth|unauth|cmd <host> <cmd>" 1>&2
     ;;
   x*)
     echo "Unknown argument: $1" 1>&2


From taru ¡÷ users.sourceforge.jp  Sat Sep 25 14:18:29 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Sat, 25 Sep 2004 14:18:29 +0900
Subject: [Ultrapossum-cvs 571] ultrapossum/debian 1.29, 1.30,
	ultrapossum-server.postinst
Message-ID: <20040925051829.2C5FF2AC020@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/ultrapossum-server.postinst,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ultrapossum/debian/ultrapossum-server.postinst	2004/09/24 03:46:07	1.29
+++ ultrapossum/debian/ultrapossum-server.postinst	2004/09/25 05:18:29	1.30
@@ -131,6 +131,17 @@
 
 #DEBHELPER#
 
+if test "x$1" = "xconfigure"; then
+  if test -f "/etc/ultrapossum/debian.cf"; then
+    . /etc/ultrapossum/debian.cf
+    if test "x$TEST_ON_UPGRADE" != "x"; then
+      if test -x "/usr/sbin/ultrapossum-test"; then
+        /usr/sbin/ultrapossum-test
+      fi
+    fi
+  fi
+fi
+
 exit 0
 
 


From taru ¡÷ users.sourceforge.jp  Sat Sep 25 14:19:08 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Sat, 25 Sep 2004 14:19:08 +0900
Subject: [Ultrapossum-cvs 572] ultrapossum/init.d 1.6,1.7,15variable
Message-ID: <20040925051908.196E42AC020@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/init.d/15variable,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ultrapossum/init.d/15variable	2004/09/24 03:46:08	1.6
+++ ultrapossum/init.d/15variable	2004/09/25 05:19:08	1.7
@@ -25,7 +25,7 @@
 if test -d $APPSCONFDIR; then
   for f in `find $APPSCONFDIR -name '*.cf'`
   do
-    eval "`ultrapossum_parse_config_shell "$f"`"
+    eval "`ultrapossum_parse_config_shell "$f" 2> /dev/null`"
   done
 fi
 


From taru ¡÷ users.sourceforge.jp  Mon Sep 27 18:07:56 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Mon, 27 Sep 2004 18:07:56 +0900
Subject: [Ultrapossum-cvs 573] ultrapossum 1.17,1.18,update-ultrapossum
Message-ID: <20040927090756.591AE2AC00E@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/update-ultrapossum,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ultrapossum/update-ultrapossum	2004/09/22 05:50:53	1.17
+++ ultrapossum/update-ultrapossum	2004/09/27 09:07:55	1.18
@@ -27,11 +27,11 @@
 trap "eval `ultrapossum-config term`" 0
 
 configure_module() {
-  ultrapossum-config module | while read f
+  for module in $@
   do
-    v="ULTRAPOSSUM_MODULE_`echo $f | tr a-z- A-Z_`"
+    v="ULTRAPOSSUM_MODULE_`echo $module | tr a-z- A-Z_`"
     if test "x$reconfig" = "x" || test "${!v}" = "installed"; then
-      $UPDATEDIR/update-$f configure
+      $UPDATEDIR/update-$module configure
     fi
   done
 }
@@ -44,7 +44,7 @@
 }
 
 sanity_module() {
-  ultrapossum-config module | while read f
+  for f in $@
   do
     v="ULTRAPOSSUM_MODULE_`echo $f | tr a-z- A-Z_`"
     if test "${!v}" = "installed"; then
@@ -54,53 +54,57 @@
 }
 
 up_to_date() {
+
   if ! test -f "$CONFSTATUS"; then
     echo "status change detected" 1>&2
     return 1
   fi
-  if test "$SLAPDCONF" -nt "$CONFSTATUS"; then
-    echo "$SLAPDCONF is newer than current status" 1>&2
-    return 1
-  fi
-  find $SYSCONFDIR | while read f
-  do
-    if test "$f" -nt "$CONFSTATUS"; then
-      echo "$f is newer than current status" 1>&2
+  if test "x$@" = "x"; then
+    if test "$SLAPDCONF" -nt "$CONFSTATUS"; then
+      echo "$SLAPDCONF is newer than current status" 1>&2
       return 1
     fi
-  done || return 1
+    find $SYSCONFDIR | while read f
+    do
+      if test "$f" -nt "$CONFSTATUS"; then
+        echo "$f is newer than current status" 1>&2
+        return 1
+      fi
+    done || return 1
+  fi
+
   return 0
 }
 
+check_configuring_module() {
+  modules=`ultrapossum-config module`
+  if ! up_to_date; then
+    echo $modules
+  else
+    for module in $modules
+    do
+      getvalues $conftemp "`ultrapossum-config variable $module`" > $conftemp.$$
+      getvalues $CONFSTATUS "`ultrapossum-config variable $module`" > $conftemp.$$2 
+      if diff -c $conftemp.$$ $conftemp.$$2 | egrep "^\! [^+]" | cut -d' ' -f2- | cut -d= -f1 | sort | uniq | egrep . > /dev/null; then
+        echo " $module"
+      fi
+      /bin/rm -f $conftemp.$$ $conftemp.$$2
+    done
+  fi
+}
+
 configure() {
   conftemp=`tempfile`
   chmod 640 $conftemp
-  getconfig | grep -v SLAPROOTPW | grep -v CHROOTFILES > $conftemp
   # little evil
-  if ! up_to_date ||
-  	diff -c $CONFSTATUS $conftemp | egrep "^\! [^+]" | cut -d' ' -f2- | cut -d= -f1 | sort | uniq | egrep . 1>&2
-  then
-    sanity_module
-
-#  if test "x$MASTER" = "x$HOST"; then
-#    if test -f "$DIRECTORY/$BACKUP.ldif"; then
-#      ssh -t $BACKUP "sh -c '
-#eval \`ultrapossum-config get SYSCONFDIR\`
-#if test "x$ULTRAPOSSUM_PROJECT" = "x"; then
-#  cf=\$SYSCONFDIR/ultrapossum.cf
-#else
-#  cf=\$SYSCONFDIR/projects/$ULTRAPOSSUM_PROJECT
-#fi
-#ultrapossum-config set \$cf SUFFIX=$SUFFIX MASTER=$MASTER BACKUP=$BACKUP > \$cf.tmp 
-#mv \$cf.tmp \$cf
-#ULTRAPOSSUM_PROJECT=$ULTRAPOSSUM_PROJECT update-ultrapossum configure'
-#"
-#    fi
-#  fi
-
+  getconfig | grep -v SLAPROOTPW | grep -v CHROOTFILES > $conftemp
+  module=`check_configuring_module`
+  if test "x$module" != "x"; then
+    sanity_module $module
     install -d $CONFDIR
 
-    configure_module
+    configure_module $module
+
     /bin/cp -p $conftemp $CONFSTATUS
     cat $conftemp > $CONFSTATUS
   else


From taru ¡÷ users.sourceforge.jp  Mon Sep 27 18:07:56 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Mon, 27 Sep 2004 18:07:56 +0900
Subject: [Ultrapossum-cvs 574] ultrapossum/init.d 1.8,1.9,10config
Message-ID: <20040927090756.6CF492AC033@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/init.d/10config,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ultrapossum/init.d/10config	2004/09/24 03:46:08	1.8
+++ ultrapossum/init.d/10config	2004/09/27 09:07:56	1.9
@@ -193,15 +193,16 @@
 # retrieve the value of the specified varialble in the specified status file
 # getvalues <status> [<var>...]
 getvalues() {
-  if test "x$2" = "x"; then
-    cat "$1"
-  else
-    f=$1
-    shift
-    for a in $@; do
-      egrep "^$a=" "$f"
-    done
-  fi
+  (
+    if test "x$2" = "x"; then
+      cat "$1"
+    else
+      f=$1
+      shift
+      source_shell $f
+      getconfig $@
+    fi
+  )
 }
 
 # getvalue <status> <var>


From taru ¡÷ users.sourceforge.jp  Mon Sep 27 18:07:56 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Mon, 27 Sep 2004 18:07:56 +0900
Subject: [Ultrapossum-cvs 575] ultrapossum/module/dnsbalance 1.4, 1.5,
	update-dnsbalance
Message-ID: <20040927090756.85B672AC04F@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/dnsbalance/update-dnsbalance,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ultrapossum/module/dnsbalance/update-dnsbalance	2004/04/13 17:43:40	1.4
+++ ultrapossum/module/dnsbalance/update-dnsbalance	2004/09/27 09:07:56	1.5
@@ -95,12 +95,10 @@
         xconfigure)
                 configure
 		ultrapossum-config set .status ULTRAPOSSUM_MODULE_DNSBALANCE=installed
-		/bin/rm -f $CONFSTATUS
         ;;
         xremove)
                 remove
 		ultrapossum-config set remove ULTRAPOSSUM_MODULE_DNSBALANCE=installed
-		/bin/rm -f $CONFSTATUS
         ;;
         xsanity)
                 sanity_check


From taru ¡÷ users.sourceforge.jp  Mon Sep 27 18:07:56 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Mon, 27 Sep 2004 18:07:56 +0900
Subject: [Ultrapossum-cvs 576] ultrapossum/module/failover 1.14, 1.15,
	update-failover
Message-ID: <20040927090756.AD0952AC055@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/failover/update-failover,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ultrapossum/module/failover/update-failover	2004/09/25 02:53:36	1.14
+++ ultrapossum/module/failover/update-failover	2004/09/27 09:07:56	1.15
@@ -203,12 +203,10 @@
 	xconfigure)
 		configure
   		ultrapossum-config set .status ULTRAPOSSUM_MODULE_FAILOVER=installed
-		/bin/rm -f $CONFSTATUS
 	;;
 	xremove)
 		remove
 		ultrapossum-config remove .status ULTRAPOSSUM_MODULE_FAILOVER
-		/bin/rm -f $CONFSTATUS
 	;;
 	xsanity)
 		sanity_check


From taru ¡÷ users.sourceforge.jp  Mon Sep 27 18:07:56 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Mon, 27 Sep 2004 18:07:56 +0900
Subject: [Ultrapossum-cvs 577] ultrapossum/module/server 1.49, 1.50,
	update-server
Message-ID: <20040927090756.C8D402AC00E@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/server/update-server,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- ultrapossum/module/server/update-server	2004/09/22 10:17:29	1.49
+++ ultrapossum/module/server/update-server	2004/09/27 09:07:56	1.50
@@ -303,12 +303,10 @@
 	xconfigure)
 		configure
 		ultrapossum-config set .status ULTRAPOSSUM_MODULE_SERVER=installed
-		/bin/rm -f $CONFSTATUS
 	;;
 	xremove)
 		remove
 		ultrapossum-config remove .status ULTRAPOSSUM_MODULE_SERVER
-		/bin/rm -f $CONFSTATUS
 	;;
 	xsanity)
 		sanity_check


From taru ¡÷ users.sourceforge.jp  Mon Sep 27 18:07:56 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Mon, 27 Sep 2004 18:07:56 +0900
Subject: [Ultrapossum-cvs 578] ultrapossum/module/startTLS 1.11, 1.12,
	update-startTLS
Message-ID: <20040927090756.E9DC42AC033@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/startTLS/update-startTLS,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ultrapossum/module/startTLS/update-startTLS	2004/07/29 08:32:59	1.11
+++ ultrapossum/module/startTLS/update-startTLS	2004/09/27 09:07:56	1.12
@@ -100,12 +100,10 @@
 		sanity
                 configure
 		ultrapossum-config set .status ULTRAPOSSUM_MODULE_STARTTLS=installed
-		/bin/rm -f $CONFSTATUS
 	;;
         xremove)
                 remove
 		ultrapossum-config remove .status ULTRAPOSSUM_MODULE_STARTTLS
-		/bin/rm -f $CONFSTATUS
         ;;
         xsanity)
                 sanity


From taru ¡÷ users.sourceforge.jp  Mon Sep 27 18:07:57 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Mon, 27 Sep 2004 18:07:57 +0900
Subject: [Ultrapossum-cvs 579] ultrapossum/module/vaj-robust 1.4, 1.5,
	update-vaj-robust
Message-ID: <20040927090757.0C49B2AC057@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/vaj-robust/update-vaj-robust,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ultrapossum/module/vaj-robust/update-vaj-robust	2004/04/02 02:34:15	1.4
+++ ultrapossum/module/vaj-robust/update-vaj-robust	2004/09/27 09:07:57	1.5
@@ -48,12 +48,10 @@
         xconfigure)
                 configure
   		ultrapossum-config set .status ULTRAPOSSUM_MODULE_VAJ_ROBUST=installed
-		/bin/rm -f $CONFSTATUS
         ;;
         xremove)
                 remove
   		ultrapossum-config remove .status ULTRAPOSSUM_MODULE_VAJ_ROBUST
-		/bin/rm -f $CONFSTATUS
         ;;
         xsanity)
                 sanity


From taru ¡÷ users.sourceforge.jp  Mon Sep 27 18:09:50 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Mon, 27 Sep 2004 18:09:50 +0900
Subject: [Ultrapossum-cvs 580] demo/uml 1.14,1.15,update-uml
Message-ID: <20040927090950.BA8052AC00E@users.sourceforge.jp>

===================================================================
RCS file: demo/uml/update-uml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- demo/uml/update-uml	2004/09/08 15:25:15	1.14
+++ demo/uml/update-uml	2004/09/27 09:09:50	1.15
@@ -120,12 +120,10 @@
 		sanity
                 configure
   		ultrapossum-config set .status ULTRAPOSSUM_MODULE_UML=installed
-		/bin/rm -f $CONFSTATUS
         ;;
         xremove)
                 remove
   		ultrapossum-config remove .status ULTRAPOSSUM_MODULE_UML
-		/bin/rm -f $CONFSTATUS
         ;;
         xsanity)
                 sanity


From taru ¡÷ users.sourceforge.jp  Mon Sep 27 18:09:50 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Mon, 27 Sep 2004 18:09:50 +0900
Subject: [Ultrapossum-cvs 581] plugin/sasl 1.3,1.4,update-sasl
Message-ID: <20040927090950.D4E2E2AC04F@users.sourceforge.jp>

===================================================================
RCS file: plugin/sasl/update-sasl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin/sasl/update-sasl	2004/09/24 03:12:21	1.3
+++ plugin/sasl/update-sasl	2004/09/27 09:09:50	1.4
@@ -62,12 +62,10 @@
         xconfigure)
                 configure
   		ultrapossum-config set .status ULTRAPOSSUM_MODULE_SASL=installed
-		/bin/rm -f $CONFSTATUS
         ;;
         xremove)
                 remove
   		ultrapossum-config remove .status ULTRAPOSSUM_MODULE_SASL
-		/bin/rm -f $CONFSTATUS
         ;;
         xsanity)
                 sanity


From taru ¡÷ users.sourceforge.jp  Mon Sep 27 18:09:50 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Mon, 27 Sep 2004 18:09:50 +0900
Subject: [Ultrapossum-cvs 582] plugin/slapd 1.1,1.2,update-slapd
Message-ID: <20040927090950.EEDF42AC055@users.sourceforge.jp>

===================================================================
RCS file: plugin/slapd/update-slapd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin/slapd/update-slapd	2004/06/24 08:29:38	1.1
+++ plugin/slapd/update-slapd	2004/09/27 09:09:50	1.2
@@ -41,12 +41,10 @@
         xconfigure)
                 configure
   		ultrapossum-config set .status ULTRAPOSSUM_MODULE_SLAPD=installed
-		/bin/rm -f $CONFSTATUS
         ;;
         xremove)
                 remove
   		ultrapossum-config remove .status ULTRAPOSSUM_MODULE_SLAPD
-		/bin/rm -f $CONFSTATUS
         ;;
         xsanity)
                 sanity


From taru ¡÷ users.sourceforge.jp  Mon Sep 27 18:09:51 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Mon, 27 Sep 2004 18:09:51 +0900
Subject: [Ultrapossum-cvs 583] plugin/snmp 1.10,1.11,update-snmp
Message-ID: <20040927090951.3823B2AC00E@users.sourceforge.jp>

===================================================================
RCS file: plugin/snmp/update-snmp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plugin/snmp/update-snmp	2004/07/03 06:19:14	1.10
+++ plugin/snmp/update-snmp	2004/09/27 09:09:51	1.11
@@ -67,12 +67,10 @@
         xconfigure)
                 configure
   		ultrapossum-config set .status ULTRAPOSSUM_MODULE_SNMP=installed
-		/bin/rm -f $CONFSTATUS
         ;;
         xremove)
                 remove
   		ultrapossum-config remove .status ULTRAPOSSUM_MODULE_SNMP
-		/bin/rm -f $CONFSTATUS
         ;;
         xsanity)
                 sanity


From taru ¡÷ users.sourceforge.jp  Mon Sep 27 18:09:51 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Mon, 27 Sep 2004 18:09:51 +0900
Subject: [Ultrapossum-cvs 584] plugin/ultramonkey 1.3,1.4,update-ultramonkey
Message-ID: <20040927090951.565A72AC04F@users.sourceforge.jp>

===================================================================
RCS file: plugin/ultramonkey/update-ultramonkey,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin/ultramonkey/update-ultramonkey	2004/07/22 12:37:01	1.3
+++ plugin/ultramonkey/update-ultramonkey	2004/09/27 09:09:51	1.4
@@ -142,12 +142,10 @@
 		sanity
                 configure
 		ultrapossum-config set .status ULTRAPOSSUM_MODULE_ULTRAMONKEY=installed
-		/bin/rm -f $CONFSTATUS
         ;;
         xremove)
                 remove
 		ultrapossum-config remove .status ULTRAPOSSUM_MODULE_ULTRAMONKEY
-		/bin/rm -f $CONFSTATUS
         ;;
         xsanity)
                 sanity


From taru ¡÷ users.sourceforge.jp  Mon Sep 27 18:45:27 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Mon, 27 Sep 2004 18:45:27 +0900
Subject: [Ultrapossum-cvs 585] ultrapossum/debian 1.60,1.61,changelog
Message-ID: <20040927094527.5086C2AC00E@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/changelog,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- ultrapossum/debian/changelog	2004/09/24 17:16:18	1.60
+++ ultrapossum/debian/changelog	2004/09/27 09:45:27	1.61
@@ -1,3 +1,9 @@
+ultrapossum (0.1beta11-0pre3) unstable; urgency=low
+
+  * Applied the latest upstream version.
+
+ -- Masato Taruishi <taru ¡÷ valinux.co.jp>  Mon, 27 Sep 2004 18:10:50 +0900
+
 ultrapossum (0.1beta11-0pre2) unstable; urgency=low
 
   * Fixed initial installation detection in .config.


From taru ¡÷ users.sourceforge.jp  Mon Sep 27 20:51:04 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Mon, 27 Sep 2004 20:51:04 +0900
Subject: [Ultrapossum-cvs 586] ultrapossum 1.3,1.4,ultrapossum-server.in
Message-ID: <20040927115104.87F782AC00E@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/ultrapossum-server.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ultrapossum/ultrapossum-server.in	2004/09/22 10:53:07	1.3
+++ ultrapossum/ultrapossum-server.in	2004/09/27 11:51:04	1.4
@@ -37,9 +37,11 @@
   ;;
   x*)
     arg "$@"
-    if ! $pkgdatadir/module.d/server/startup "$@" > /dev/null 2> /dev/null
+    if ! $pkgdatadir/module.d/server/startup "$@" 2> /dev/null
     then
       echo "E: failed to start ultrapossum-server. use -v to see the detail." 1>&2
+    else
+      echo "." 
     fi
   ;;
 esac


From taru ¡÷ users.sourceforge.jp  Mon Sep 27 20:51:04 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Mon, 27 Sep 2004 20:51:04 +0900
Subject: [Ultrapossum-cvs 587] ultrapossum/init.d 1.7,1.8,15variable
Message-ID: <20040927115104.A073B2AC055@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/init.d/15variable,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ultrapossum/init.d/15variable	2004/09/25 05:19:08	1.7
+++ ultrapossum/init.d/15variable	2004/09/27 11:51:04	1.8
@@ -21,12 +21,4 @@
 
 eval "`ultrapossum_parse_config_shell "$ULTRAPOSSUMCF"`"
 eval "`ultrapossum_parse_config_shell "$SYSCONFDIR/secret.cf" 2> /dev/null`"
-
-if test -d $APPSCONFDIR; then
-  for f in `find $APPSCONFDIR -name '*.cf'`
-  do
-    eval "`ultrapossum_parse_config_shell "$f" 2> /dev/null`"
-  done
-fi
-
 eval "`ultrapossum_parse_config_shell "$SYSCONFDIR/projects/$ULTRAPOSSUM_PROJECT"`"


From taru ¡÷ users.sourceforge.jp  Mon Sep 27 20:51:48 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Mon, 27 Sep 2004 20:51:48 +0900
Subject: [Ultrapossum-cvs 588] ultrapossum 1.4,1.5,ultrapossum-server.in
Message-ID: <20040927115148.F0A872AC00E@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/ultrapossum-server.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ultrapossum/ultrapossum-server.in	2004/09/27 11:51:04	1.4
+++ ultrapossum/ultrapossum-server.in	2004/09/27 11:51:48	1.5
@@ -37,11 +37,9 @@
   ;;
   x*)
     arg "$@"
-    if ! $pkgdatadir/module.d/server/startup "$@" 2> /dev/null
+    if ! $pkgdatadir/module.d/server/startup "$@" 2> /dev/null > /dev/null
     then
       echo "E: failed to start ultrapossum-server. use -v to see the detail." 1>&2
-    else
-      echo "." 
     fi
   ;;
 esac


From taru ¡÷ users.sourceforge.jp  Tue Sep 28 00:15:45 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 28 Sep 2004 00:15:45 +0900
Subject: [Ultrapossum-cvs 589] demo/uml/debian 1.1,1.2,init.d 1.3,1.4,rules
Message-ID: <20040927151545.A2C922AC057@users.sourceforge.jp>

===================================================================
RCS file: demo/uml/debian/init.d,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- demo/uml/debian/init.d	2004/07/03 10:22:39	1.1
+++ demo/uml/debian/init.d	2004/09/27 15:15:45	1.2
@@ -39,9 +39,14 @@
 	echo "."
 	;;
   stop)
-  	echo "Not yet supported"
+	echo -n "Stopping $DESC: "
+        for h in $UML_HOSTS
+	do
+	  $MODULEDIR/uml/shutdown $h
+	  echo -n " $h"
+        done
+	echo "."
 	exit 0 
-#	echo -n "Stopping $DESC: "
 #	start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
 #		--exec $DAEMON
 #	echo "$NAME."
===================================================================
RCS file: demo/uml/debian/rules,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- demo/uml/debian/rules	2004/09/06 07:22:13	1.3
+++ demo/uml/debian/rules	2004/09/27 15:15:45	1.4
@@ -9,7 +9,7 @@
 VERSION := $(shell dpkg-parsechangelog | grep Version | cut -d' ' -f2)
 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
-DEB_DH_INSTALLINIT_ARGS := -- defaults 18
+DEB_DH_INSTALLINIT_ARGS := -r -- defaults 18
 
 common-binary-post-install-indep::
 	install -d $(DEB_DESTDIR)/etc/devfs/conf.d/


From taru ¡÷ users.sourceforge.jp  Tue Sep 28 00:15:45 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 28 Sep 2004 00:15:45 +0900
Subject: [Ultrapossum-cvs 590] demo/uml ...
Message-ID: <20040927151545.7FD352AC00E@users.sourceforge.jp>

===================================================================
RCS file: demo/uml/20uml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- demo/uml/20uml	2004/07/22 12:37:01	1.4
+++ demo/uml/20uml	2004/09/27 15:15:45	1.5
@@ -35,6 +35,7 @@
   UML_MEM=$(ultrapossum_getconf UML_MEM "64M")
   UML_ULTRAPOSSUM_EXTRA_PACKAGES=$(ultrapossum_getconf UML_ULTRAPOSSUM_EXTRA_PACKAGES "")
   UML_MULTICASTADDR=$(ultrapossum_getconf UML_MULTICASTADDR "")
+  UML_LOCALNETPREFIX=$(ultrapossum_getconf UML_LOCALNETPREFIX "192.168.0")
 fi
 
 # Parsing configuration file
===================================================================
RCS file: demo/uml/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- demo/uml/Makefile.am	2004/06/29 12:15:26	1.1
+++ demo/uml/Makefile.am	2004/09/27 15:15:45	1.2
@@ -10,7 +10,8 @@
 templatedir = $(sysconfdir)/ultrapossum/in.d
 template_DATA = rootstrap.conf.in
 
-modulelocal_SCRIPTS = map rootstrap.sh uml-run createrootfs.sh boot
+modulelocal_SCRIPTS = map rootstrap.sh uml-run createrootfs.sh \
+	shutdown boot runlist
 
 rootstrapmodulesdir = $(sysconfdir)/rootstrap/modules
 rootstrapmodules_SCRIPTS = ultrapossum
@@ -19,5 +20,7 @@
 	update-uml \
 	20uml \
 	rootstrap.conf.in \
-	boot
+	boot \
+	shutdown \
+	runlist
 
===================================================================
RCS file: demo/uml/boot,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- demo/uml/boot	2004/07/22 12:37:01	1.10
+++ demo/uml/boot	2004/09/27 15:15:45	1.11
@@ -27,11 +27,11 @@
   fi
 fi
 
-if include $1 "`screen -list | grep ultrapossum | cut -d- -f2- | awk -F' ' '{print $1;}'`"
+if include $1 "`$MODULEDIR/uml/runlist`"
 then
   echo "$1 already booted" 1>&2
   exit 0
 fi
 
-screen -d -m -S ultrapossum-$1 $MODULEDIR/uml/uml-run $1 su -c "linux ubd0=$root con0=fd:0,fd:1 con=pts mem=$UML_MEM eth0=tuntap,$host_if,,$host eth1=mcast,,$UML_MULTICASTADDR" $UML_USER
+screen -d -m -S ultrapossum-$1 $MODULEDIR/uml/uml-run $1 su -c "linux ubd0=$root con0=fd:0,fd:1 con=pts mem=$UML_MEM eth0=tuntap,$host_if,,$host eth1=mcast,,$UML_MULTICASTADDR umid=$1 uml_dir=$UMLDIR/$1/" $UML_USER
 
===================================================================
RCS file: demo/uml/map,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- demo/uml/map	2004/07/23 07:48:34	1.3
+++ demo/uml/map	2004/09/27 15:15:45	1.4
@@ -51,6 +51,6 @@
 echo "host_if=tap$id"
 echo "ultrapossum_packages='$pkgs'"
 echo "local_gateway=$local_gateway"
-echo "local_net=192.168.0.$id"
+echo "local_net=$UML_LOCALNETPREFIX.$id"
 echo "local_host=$local_host"
 
===================================================================
RCS file: demo/uml/rootstrap.conf.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- demo/uml/rootstrap.conf.in	2004/07/23 07:48:34	1.5
+++ demo/uml/rootstrap.conf.in	2004/09/27 15:15:45	1.6
@@ -119,6 +119,7 @@
 ultrapossum_packages=#ULTRAPOSSUM_PACKAGES#
 ultrapossum_hosts=#ULTRAPOSSUM_HOSTS#
 ultrapossum_local_net=#ULTRAPOSSUM_LOCALNET#
+ultrapossum_localnet=#UML_LOCALNETPREFIX#.0/24
 ultrapossum_local_gateway=#ULTRAPOSSUM_LOCALGATEWAY#
 ultrapossum_local_host=#ULTRAPOSSUM_LOCALHOST#
 
===================================================================
RCS file: demo/uml/rootstrap.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- demo/uml/rootstrap.sh	2004/07/22 12:37:01	1.4
+++ demo/uml/rootstrap.sh	2004/09/27 15:15:45	1.5
@@ -24,5 +24,6 @@
 	-e "s/#ULTRAPOSSUM_LOCALGATEWAY#/$local_gateway/" \
 	-e "s/#ULTRAPOSSUM_LOCALNET#/$local_net/" \
 	-e "s/#ULTRAPOSSUM_LOCALHOST#/$local_host/" \
+	-e "s/#UML_LOCALNETPREFIX#/$UML_LOCALNETPREFIX/" \
 		< $UML_ROOTSTRAP_CONF_IN
 
===================================================================
RCS file: demo/uml/ultrapossum,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- demo/uml/ultrapossum	2004/07/23 07:48:34	1.6
+++ demo/uml/ultrapossum	2004/09/27 15:15:45	1.7
@@ -26,9 +26,9 @@
 EOF
 else
   cat >> $TARGET/etc/network/interfaces <<EOF
-	up /sbin/iptables -A POSTROUTING -t nat -s 192.168.0.0/24 -j MASQUERADE
+	up /sbin/iptables -A POSTROUTING -t nat -s $ultrapossum_localnet -j MASQUERADE
 	up echo 1 > /proc/sys/net/ipv4/ip_forward
-	down /sbin/iptables -D POSTROUTING -t nat -s 192.168.0.0/24 -j MASQUERADE
+	down /sbin/iptables -D POSTROUTING -t nat -s $ultrapossum_localnet -j MASQUERADE
 EOF
   cat >> $TARGET/etc/modules <<EOF
 ip_vs_rr
@@ -42,4 +42,10 @@
   echo "SLAVES=\"$SLURPDSLAVES\"" >> $TARGET/etc/ultrapossum/ultrapossum.cf
   echo "VIRTUALSLAVE=\"$uml\"" >> $TARGET/etc/ultrapossum/ultrapossum.cf
 fi
+
+# Ctrl-Alt-Delete hack
+/bin/cp -p $TARGET/etc/inittab $TARGET/etc/inittabT
+sed 's!^ca.*!ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -h now!' $TARGET/etc/inittab > $TARGET/etc/inittabT
+mv $TARGET/etc/inittabT $TARGET/etc/inittab
+
 chroot $TARGET /bin/sh -c "apt-get update && apt-get -y -o DPkg::Options::="--force-confold" -f install $ultrapossum_packages && run-parts --arg=stop /etc/init.d/"
===================================================================
RCS file: demo/uml/uml.cf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- demo/uml/uml.cf	2004/07/02 10:39:09	1.2
+++ demo/uml/uml.cf	2004/09/27 15:15:45	1.3
@@ -16,3 +16,5 @@
 
 #UML_ULTRAPOSSUM_EXTRA_PACKAGES="ultrapossum-snmp ultrapossum-slapd"
 
+#UML_LOCALNETPREFIX="192.168.0"
+


From taru ¡÷ users.sourceforge.jp  Tue Sep 28 00:23:05 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 28 Sep 2004 00:23:05 +0900
Subject: [Ultrapossum-cvs 591] demo/uml 1.1,1.2,shutdown
Message-ID: <20040927152305.AC3342AC00E@users.sourceforge.jp>

===================================================================
RCS file: demo/uml/shutdown,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- demo/uml/shutdown	2004/09/27 15:15:45	1.1
+++ demo/uml/shutdown	2004/09/27 15:23:05	1.2
@@ -12,7 +12,7 @@
 
 if ! test -e "$UMLDIR/$1/$1/mconsole"; then
   echo "$1 not booted" 1>&2
-  exit 1
+  exit 0
 fi
 
 echo cad | uml_mconsole $UMLDIR/$1/$1/mconsole 2> /dev/null > /dev/null


From taru ¡÷ users.sourceforge.jp  Tue Sep 28 01:27:45 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 28 Sep 2004 01:27:45 +0900
Subject: [Ultrapossum-cvs 592] ultrapossum ...
Message-ID: <20040927162745.9A0D72AC00E@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ultrapossum/Makefile.am	2004/09/22 10:33:52	1.15
+++ ultrapossum/Makefile.am	2004/09/27 16:27:45	1.16
@@ -6,6 +6,8 @@
 pkgdata_DATA = \
 	modules term variable
 
+pkgdata_SCRIPTS = sshman
+
 aclocaldir = @aclocaldir@
 aclocal_DATA = ultrapossum.m4
 
@@ -63,7 +65,8 @@
 	python/UltraPossum.py \
 	redhat/ultrapossum.init \
 	term \
-	COPYRIGHT
+	COPYRIGHT \
+	sshman
 
 .PHONY: init.d/variable
 
===================================================================
RCS file: ultrapossum/update-ultrapossum,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ultrapossum/update-ultrapossum	2004/09/27 09:07:55	1.18
+++ ultrapossum/update-ultrapossum	2004/09/27 16:27:45	1.19
@@ -16,7 +16,7 @@
 #
 
 # Usage:
-#    update-ultrapossum <configure|remove|sanity|reconfigure>
+#    update-ultrapossum [-f] <configure|remove|sanity|reconfigure>
 #
 
 # $Id$
@@ -116,7 +116,13 @@
 
 remove() {
   remove_module
+  $SHAREDIR/sshman unauth
 }
+
+if test "x$1" = "x-f"; then
+  /bin/rm -f $CONFSTATUS
+  shift
+fi
 
 case "x$1" in
 	xconfigure)


From taru ¡÷ users.sourceforge.jp  Tue Sep 28 01:27:45 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 28 Sep 2004 01:27:45 +0900
Subject: [Ultrapossum-cvs 593] ultrapossum/debian 1.8, 1.9,
	ultrapossum-common.install
Message-ID: <20040927162745.ADE622AC062@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/ultrapossum-common.install,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ultrapossum/debian/ultrapossum-common.install	2004/09/15 12:17:50	1.8
+++ ultrapossum/debian/ultrapossum-common.install	2004/09/27 16:27:45	1.9
@@ -1,6 +1,7 @@
 debian/tmp/usr/sbin/update-ultrapossum
 debian/tmp/usr/bin/ultrapossum-config
 debian/tmp/usr/share/ultrapossum/modules
+debian/tmp/usr/share/ultrapossum/sshman
 debian/tmp/usr/share/ultrapossum/init.d
 debian/tmp/usr/share/ultrapossum/term
 debian/tmp/usr/share/ultrapossum/variable


From taru ¡÷ users.sourceforge.jp  Tue Sep 28 01:27:45 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 28 Sep 2004 01:27:45 +0900
Subject: [Ultrapossum-cvs 594] ultrapossum/module/server ...
Message-ID: <20040927162745.DEA092AC064@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/server/10server,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ultrapossum/module/server/10server	2004/09/24 14:05:56	1.17
+++ ultrapossum/module/server/10server	2004/09/27 16:27:45	1.18
@@ -21,11 +21,9 @@
   xserver|x)
 
 create_environ() {
-  progress "Creating directory environment information... "
   touch $DIRECTORY/ultrapossum-environ
   chmod 640 $DIRECTORY/ultrapossum-environ
   getconfig | grep -v ROOTPW | grep -v CREDENTIALS > $DIRECTORY/ultrapossum-environ
-  progress "Creating directory environment information... done"
 }
 
 if test "x$cache" = "x"; then
@@ -217,7 +215,11 @@
 
 UPDATEDN=`ultrapossum_getconf UPDATEDN $UPDATERDN,$SUFFIX`
 if test "x$UPDATEREF" = "x"; then
-  UPDATEREF="ldap://$LDAPMASTER:$LDAPLISTENPORT/"
+  if test "x$LDAPLISTENPORT" != "x"; then
+    UPDATEREF="ldap://$LDAPMASTER:$LDAPLISTENPORT/"
+  else
+    UPDATEREF="ldap://$LDAPMASTER/"
+  fi
 fi
 
 if test "x$SLURPDSLAVES" != "x"; then
===================================================================
RCS file: ultrapossum/module/server/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ultrapossum/module/server/Makefile.am	2004/07/01 17:38:18	1.11
+++ ultrapossum/module/server/Makefile.am	2004/09/27 16:27:45	1.12
@@ -14,7 +14,6 @@
 	runtime \
 	backup.sh \
 	apps \
-	sshman \
 	fetchldif \
 	pid
 
@@ -58,7 +57,6 @@
 	runtime \
 	backup.sh \
 	apps \
-	sshman \
 	fetchldif \
 	pid
 
===================================================================
RCS file: ultrapossum/module/server/createdb.sh,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ultrapossum/module/server/createdb.sh	2004/09/07 10:30:45	1.24
+++ ultrapossum/module/server/createdb.sh	2004/09/27 16:27:45	1.25
@@ -102,7 +102,7 @@
 else
  ldiffile=$DIRECTORY/$HOST.ldif
  if ! test -s $ldiffile; then
-   if ! $MODULEDIR/server/sshman cmd "$MASTER" fetchldif > $ldiffile; then
+   if ! $SHAREDIR/sshman cmd "$MASTER" server/fetchldif > $ldiffile; then
      echo "E: fail to fetch the initial directory from $MASTER" 1>&2
      /bin/rm -rf $DIRECTORY
      exit 1
===================================================================
RCS file: ultrapossum/module/server/update-server,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- ultrapossum/module/server/update-server	2004/09/27 09:07:56	1.50
+++ ultrapossum/module/server/update-server	2004/09/27 16:27:45	1.51
@@ -280,8 +280,8 @@
   fi
   configure_slapd
   if test "x$SLAVES" != "x" && test "x$MASTER" = "x$HOST"; then
-    $MODULEDIR/server/sshman keygen fetchldif
-    $MODULEDIR/server/sshman auth
+    $SHAREDIR/sshman keygen server/fetchldif
+    $SHAREDIR/sshman auth
   fi
 }
 
@@ -295,8 +295,8 @@
   fi
   if test "x$SLAVES" = "x" || test "x$MASTER" != "x$HOST"; then
     /bin/rm -rf $SSHKEYDIR/fetchldif/
+    $SHAREDIR/sshman auth
   fi
-  $MODULEDIR/server/sshman unauth
 }
 
 case "x$1" in


From taru ¡÷ users.sourceforge.jp  Tue Sep 28 01:30:06 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 28 Sep 2004 01:30:06 +0900
Subject: [Ultrapossum-cvs 595] ultrapossum/debian 1.4,1.5,cvsdeb_hook
Message-ID: <20040927163006.EDFA72AC00E@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/cvsdeb_hook,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ultrapossum/debian/cvsdeb_hook	2004/03/31 13:19:40	1.4
+++ ultrapossum/debian/cvsdeb_hook	2004/09/27 16:30:06	1.5
@@ -1,3 +1,4 @@
 #!/bin/sh
+./autogen.sh
 cd ..
 tar zkxf $1_$upstream_version.orig.tar.gz 2> /dev/null || true


From taru ¡÷ users.sourceforge.jp  Tue Sep 28 01:33:35 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 28 Sep 2004 01:33:35 +0900
Subject: [Ultrapossum-cvs 596] ultrapossum 1.4,1.5,autogen.sh
Message-ID: <20040927163335.38F8A2AC00E@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/autogen.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ultrapossum/autogen.sh	2004/06/01 05:15:34	1.4
+++ ultrapossum/autogen.sh	2004/09/27 16:33:35	1.5
@@ -3,5 +3,5 @@
 set -e
 
 aclocal
-automake -a
+automake -a -c
 autoconf


From taru ¡÷ users.sourceforge.jp  Tue Sep 28 01:35:44 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 28 Sep 2004 01:35:44 +0900
Subject: [Ultrapossum-cvs 597] ultrapossum/debian 1.61,1.62,changelog
Message-ID: <20040927163544.822292AC00E@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/changelog,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- ultrapossum/debian/changelog	2004/09/27 09:45:27	1.61
+++ ultrapossum/debian/changelog	2004/09/27 16:35:44	1.62
@@ -1,3 +1,9 @@
+ultrapossum (0.1beta11-0pre4) unstable; urgency=low
+
+  * Applied the latest upstream version.
+
+ -- Masato Taruishi <taru ¡÷ valinux.co.jp>  Tue, 28 Sep 2004 01:33:54 +0900
+
 ultrapossum (0.1beta11-0pre3) unstable; urgency=low
 
   * Applied the latest upstream version.


From taru ¡÷ users.sourceforge.jp  Tue Sep 28 01:55:05 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 28 Sep 2004 01:55:05 +0900
Subject: [Ultrapossum-cvs 598] demo/uml 1.7,1.8,ultrapossum
Message-ID: <20040927165505.853212AC00E@users.sourceforge.jp>

===================================================================
RCS file: demo/uml/ultrapossum,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- demo/uml/ultrapossum	2004/09/27 15:15:45	1.7
+++ demo/uml/ultrapossum	2004/09/27 16:55:05	1.8
@@ -3,15 +3,21 @@
 export DEBIAN_FRONTEND=noninteractive
 export UCF_FORCE_CONFFOLD=1
 
+# Configuration sharing
 cp -a /tmp/host/var/lib/ultrapossum/uml/etc $TARGET/etc/ultrapossum
 if test -f /tmp/host/var/lib/ultrapossum/uml/ssh_known_hosts; then
   install -d $TARGET/etc/ssh/
   cp //tmp/host/var/lib/ultrapossum/uml/ssh_known_hosts $TARGET/etc/ssh/ssh_known_hosts
 fi
+
+# APT repository
 echo "deb $ultrapossum_apt" >> $TARGET/etc/apt/sources.list
 echo "deb http://ultrapossum.org/experimental/debian/ ./" >> $TARGET/etc/apt/sources.list
 echo "deb $ultramonkey_apt" >> $TARGET/etc/apt/sources.list
+
 chroot $TARGET mount -t proc proc /proc
+
+# Network configuration
 cat /tmp/host/$ultrapossum_hosts >> $TARGET/etc/hosts
 cat >> $TARGET/etc/network/interfaces <<EOF
 auto eth1


From taru ¡÷ users.sourceforge.jp  Tue Sep 28 02:08:17 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 28 Sep 2004 02:08:17 +0900
Subject: [Ultrapossum-cvs 599] ultrapossum/module/server 1.51, 1.52,
	update-server
Message-ID: <20040927170817.39E252AC00E@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/server/update-server,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- ultrapossum/module/server/update-server	2004/09/27 16:27:45	1.51
+++ ultrapossum/module/server/update-server	2004/09/27 17:08:17	1.52
@@ -79,19 +79,23 @@
   done
   ULTRAPOSSUMMARK=$oldmark
 
-  cp /dev/null $ULTRAPOSSUMLDIF
-  chmod 640 $ULTRAPOSSUMLDIF
-  $MODULEDIR/server/ldif.sh > $ULTRAPOSSUMLDIF
+  if test "x$HOST" = "x$MASTER"; then
+    cp /dev/null $ULTRAPOSSUMLDIF
+    chmod 640 $ULTRAPOSSUMLDIF
+    $MODULEDIR/server/ldif.sh > $ULTRAPOSSUMLDIF
 
-  cp /dev/null $APPSLDIF
-  chmod 640 $APPSLDIF
-  $MODULEDIR/server/apps ldif > $APPSLDIF
+    cp /dev/null $APPSLDIF
+    chmod 640 $APPSLDIF
+    $MODULEDIR/server/apps ldif > $APPSLDIF
+  else
+    /bin/rm -f $ULTRAPOSSUMLDIF $APPSLDIF
+  fi
 
   ULTRAPOSSUM_INDEX=`egrep '^index' $ULTRAPOSSUM_MASTER_SLAPD_CONF 2> /dev/null | tr '\n' ' '`
 
   progress "Configuring OpenLDAP for $TYPE... done"
 
-  if test -f "$ULTRAPOSSUM_INIT_LDIF_IN"; then
+  if test "x$HOST" = "x$MASTER" && test -f "$ULTRAPOSSUM_INIT_LDIF_IN"; then
     progress "Configuring initial LDIF... "
     sed -e "s/#SUFFIX#/$SUFFIX/" < $ULTRAPOSSUM_INIT_LDIF_IN > $INITLDIF
     progress "Configuring initial LDIF... done"


From taru ¡÷ users.sourceforge.jp  Tue Sep 28 02:31:34 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 28 Sep 2004 02:31:34 +0900
Subject: [Ultrapossum-cvs 600] demo/uml 1.2,1.3,shutdown
Message-ID: <20040927173134.1AED72AC062@users.sourceforge.jp>

===================================================================
RCS file: demo/uml/shutdown,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- demo/uml/shutdown	2004/09/27 15:23:05	1.2
+++ demo/uml/shutdown	2004/09/27 17:31:34	1.3
@@ -2,8 +2,13 @@
 
 set -e
 
+if test "x$1" = "x-n"; then
+  nowait=1
+  shift
+fi
+
 if test "x$1" = "x"; then
-  echo "Usage: $0 <server>" 1>&2
+  echo "Usage: $0 [-n] <server>" 1>&2
   exit 1
 fi
 
@@ -11,11 +16,13 @@
 trap "eval `ultrapossum-config term`" 0
 
 if ! test -e "$UMLDIR/$1/$1/mconsole"; then
-  echo "$1 not booted" 1>&2
   exit 0
 fi
 
-echo cad | uml_mconsole $UMLDIR/$1/$1/mconsole 2> /dev/null > /dev/null
+uml_mconsole $UMLDIR/$1/$1/mconsole cad > /dev/null 2> /dev/null
+if test "$nowait" = "1"; then
+  exit 0
+fi
 for s in 5 5 4 4 3 3 2 2 1 1 1
 do
   if ! include "$1" "`$MODULEDIR/uml/runlist`"; then


From taru ¡÷ users.sourceforge.jp  Tue Sep 28 02:31:34 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 28 Sep 2004 02:31:34 +0900
Subject: [Ultrapossum-cvs 601] demo/uml/debian 1.2,1.3,init.d
Message-ID: <20040927173134.3130C2AC064@users.sourceforge.jp>

===================================================================
RCS file: demo/uml/debian/init.d,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- demo/uml/debian/init.d	2004/09/27 15:15:45	1.2
+++ demo/uml/debian/init.d	2004/09/27 17:31:34	1.3
@@ -42,6 +42,10 @@
 	echo -n "Stopping $DESC: "
         for h in $UML_HOSTS
 	do
+	  $MODULEDIR/uml/shutdown -n $h
+        done
+        for h in $UML_HOSTS
+	do
 	  $MODULEDIR/uml/shutdown $h
 	  echo -n " $h"
         done


From taru ¡÷ users.sourceforge.jp  Tue Sep 28 02:34:22 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 28 Sep 2004 02:34:22 +0900
Subject: [Ultrapossum-cvs 602] demo/uml/debian 1.3,1.4,init.d
Message-ID: <20040927173422.E64B92AC048@users.sourceforge.jp>

===================================================================
RCS file: demo/uml/debian/init.d,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- demo/uml/debian/init.d	2004/09/27 17:31:34	1.3
+++ demo/uml/debian/init.d	2004/09/27 17:34:22	1.4
@@ -29,8 +29,6 @@
 case "$1" in
   start)
 	echo -n "Starting $DESC:"
-#	start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
-#		--exec $DAEMON -- $DAEMON_OPTS
         for h in $UML_HOSTS
 	do
 	  $MODULEDIR/uml/boot $h
@@ -50,10 +48,6 @@
 	  echo -n " $h"
         done
 	echo "."
-	exit 0 
-#	start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
-#		--exec $DAEMON
-#	echo "$NAME."
 	;;
   #reload)
 	#


From taru ¡÷ users.sourceforge.jp  Tue Sep 28 22:32:59 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 28 Sep 2004 22:32:59 +0900
Subject: [Ultrapossum-cvs 603] plugin/snmp/snmppass.d 1.11,1.12,snmpgen
Message-ID: <20040928133259.19F872AC010@users.sourceforge.jp>

===================================================================
RCS file: plugin/snmp/snmppass.d/snmpgen,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- plugin/snmp/snmppass.d/snmpgen	2004/09/11 02:16:56	1.11
+++ plugin/snmp/snmppass.d/snmpgen	2004/09/28 13:32:59	1.12
@@ -25,7 +25,7 @@
 fi
 
 failover() {
-  if ps ax -o cmd= | grep "$hasysconfdir/resource.d/ldap start" | grep -v grep > /dev/null; then
+  if test "x$FAILOVER_RECOVERY_PIDFILE" != "x" && test "x`$MODULEDIR/server/pid status $FAILOVER_RECOVERY_PIDFILE`" = "xrunning"; then
     return 0
   else
     return 1


From taru ¡÷ users.sourceforge.jp  Tue Sep 28 23:22:53 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 28 Sep 2004 23:22:53 +0900
Subject: [Ultrapossum-cvs 604] ultrapossum 1.16, 1.17, Makefile.am 1.47, 1.48,
	configure.in
Message-ID: <20040928142253.95B862AC01D@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ultrapossum/Makefile.am	2004/09/27 16:27:45	1.16
+++ ultrapossum/Makefile.am	2004/09/28 14:22:53	1.17
@@ -25,15 +25,12 @@
 	$(mkinstalldirs) $(DESTDIR)/$(sysconfdir)/$(PACKAGE)
 	$(mkinstalldirs) $(DESTDIR)/$(sysconfdir)/$(PACKAGE)/projects/
 	$(mkinstalldirs) $(DESTDIR)/$(sysconfdir)/$(PACKAGE)/apps/
-	test -f $(DESTDIR)/$(sysconfdir)/$(PACKAGE)/ultrapossum.cf || \
-		( $(INSTALL_DATA) $(srcdir)/ultrapossum.cf \
-			$(DESTDIR)/$(sysconfdir)/$(PACKAGE) )
-	test -f $(DESTDIR)/$(sysconfdir)/$(PACKAGE)/default.cf || \
-		$(INSTALL_DATA) $(srcdir)/default.cf \
-			$(DESTDIR)/$(sysconfdir)/$(PACKAGE)
-	test -f $(DESTDIR)/$(sysconfdir)/$(PACKAGE)/config.cf || \
-		$(INSTALL_DATA) $(srcdir)/config.cf \
-			$(DESTDIR)/$(sysconfdir)/$(PACKAGE)
+	$(INSTALL_DATA) $(srcdir)/ultrapossum.cf \
+		$(DESTDIR)/$(sysconfdir)/$(PACKAGE)
+	$(INSTALL_DATA) $(srcdir)/default.cf \
+		$(DESTDIR)/$(sysconfdir)/$(PACKAGE)
+	$(INSTALL_DATA) $(srcdir)/config.cf \
+		$(DESTDIR)/$(sysconfdir)/$(PACKAGE)
 	$(mkinstalldirs) $(DESTDIR)/$(localstatedir)/cache/$(PACKAGE)
 	chmod 1777 $(DESTDIR)/$(localstatedir)/cache/$(PACKAGE)
 
===================================================================
RCS file: ultrapossum/configure.in,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ultrapossum/configure.in	2004/09/24 14:12:29	1.47
+++ ultrapossum/configure.in	2004/09/28 14:22:53	1.48
@@ -4,8 +4,8 @@
 # $Id$
 
 AC_PREREQ(2.50)
-AC_INIT(ultrapossum, 0.1beta11, taru ¡÷ ultrapossum.org)
-AM_INIT_AUTOMAKE(ultrapossum, 0.1beta11)
+AC_INIT(ultrapossum, 0.1beta12, taru ¡÷ ultrapossum.org)
+AM_INIT_AUTOMAKE(ultrapossum, 0.1beta12)
 
 # Checks for programs.
 AC_PROG_INSTALL


From taru ¡÷ users.sourceforge.jp  Tue Sep 28 23:22:53 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 28 Sep 2004 23:22:53 +0900
Subject: [Ultrapossum-cvs 605] ultrapossum/debian ...
Message-ID: <20040928142253.CC49A2AC077@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/ultrapossum-failover.config,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ultrapossum/debian/ultrapossum-failover.config	2004/09/24 17:07:03	1.6
+++ ultrapossum/debian/ultrapossum-failover.config	2004/09/28 14:22:53	1.7
@@ -47,12 +47,15 @@
   db_go || true
 
   db_get ultrapossum-failover/backup
-  if include "$RET" "$SLURPDSLAVES"; then
+  case "$SLURPDSLAVES" in
+  *$RET*)
     db_input high ultrapossum-failover/nfsdir || true
     db_go || true
-  else
+    ;;
+  *) 
     db_set ultrapossum-failover/nfsdir ""
-  fi
+    ;;
+  esac
 else
   db_set ultrapossum-failover/backup ""
 fi
===================================================================
RCS file: ultrapossum/debian/ultrapossum-failover.postrm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ultrapossum/debian/ultrapossum-failover.postrm	2004/07/13 08:16:43	1.3
+++ ultrapossum/debian/ultrapossum-failover.postrm	2004/09/28 14:22:53	1.4
@@ -29,7 +29,7 @@
 	done
 
 	for f in resource.d/syncbackup \
-		resource.d/ldap
+		resource.d/ldap resource.d/mon
 	do
 	  /bin/rm -f /etc/ha.d/$f
 	  ucf --purge /etc/ha.d/$f || true


From taru ¡÷ users.sourceforge.jp  Tue Sep 28 23:22:54 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 28 Sep 2004 23:22:54 +0900
Subject: [Ultrapossum-cvs 606] ultrapossum/module/failover/heartbeat ...
Message-ID: <20040928142254.194DE2AC078@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/failover/heartbeat/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ultrapossum/module/failover/heartbeat/Makefile.am	2004/09/25 02:49:26	1.2
+++ ultrapossum/module/failover/heartbeat/Makefile.am	2004/09/28 14:22:54	1.3
@@ -5,7 +5,6 @@
 install-exec-local:
 	$(mkinstalldirs) $(DESTDIR)/$(hascriptsdir)/
 	for r in $(RESOURCES); do \
-	  test -f $(DESTDIR)/$(hascriptsdir)/$$r || \
 		$(INSTALL_SCRIPT) $(srcdir)/$$r \
 		$(DESTDIR)/$(hascriptsdir)/; \
 	done
===================================================================
RCS file: ultrapossum/module/failover/heartbeat/ldap,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ultrapossum/module/failover/heartbeat/ldap	2004/09/22 12:31:11	1.3
+++ ultrapossum/module/failover/heartbeat/ldap	2004/09/28 14:22:54	1.4
@@ -28,23 +28,33 @@
 source_shell $HA_DIR/shellfuncs
 
 ldap_start () {
-
+  echo $$ > $FAILOVER_RECOVERY_PIDFILE
+  if test "x`$MODULEDIR/server/startup master_status`" = "xstopped"; then
     ha_log "info: $0: Starting"
 
+    # recovery 
     if test "x$NFSDIR" != "x" && ! include "$BACKUP" "$SYNCBACKUPS"; then
       $MODULEDIR/failover/recovery
     fi
 
-    $MODULEDIR/server/startup master_start
-
+    # running master service
+    if ! $MODULEDIR/server/startup master_start; then
+      ha_log "Info: $0: Master can't be started"
+    fi
+  else
+    ha_log "info: $0: Master already running"
+  fi
+  /bin/rm -f $FAILOVER_RECOVERY_PIDFILE
 }
 
 ldap_stop () {
     ha_log "info: $0: Shutting down"
     $MODULEDIR/server/startup master_stop
     if test "x$HOST" = "x$BACKUP" && ! include "$BACKUP" "$SYNCBACKUPS"; then
-      ha_log "starting slave slapd"
-      ldapslave_start
+      if test "x`$SHAREDIR/server/startup slave_status`" = "xstopped"; then
+        ha_log "starting slave slapd"
+        ldapslave_start
+      fi
     fi
 }
 
===================================================================
RCS file: ultrapossum/module/failover/heartbeat/syncbackup,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ultrapossum/module/failover/heartbeat/syncbackup	2004/09/22 12:31:11	1.4
+++ ultrapossum/module/failover/heartbeat/syncbackup	2004/09/28 14:22:54	1.5
@@ -26,13 +26,17 @@
 source_shell $HA_DIR/shellfuncs
 
 stop () {
-  ha_log "starting syncbackup slapd"
-  ldapslave_start
+  if test "x`ldapslave_status`" = "xstopped"; then
+    ha_log "Info: $0: starting syncbackup slapd"
+    ldapslave_start
+  fi
 }
 
 start() {
-  ha_log "stopping syncbackup slapd"
-  ldapslave_stop
+  if test "x`ldapslave_status`" = "xrunning"; then
+    ha_log "Info: $0: stopping syncbackup slapd"
+    ldapslave_stop
+  fi
 }
 
 case "$1" in


From taru ¡÷ users.sourceforge.jp  Tue Sep 28 23:22:54 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 28 Sep 2004 23:22:54 +0900
Subject: [Ultrapossum-cvs 607] ultrapossum/module/server 1.12, 1.13,
	Makefile.am 1.3, 1.4, pid
Message-ID: <20040928142254.2F9152AC07A@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/server/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ultrapossum/module/server/Makefile.am	2004/09/27 16:27:45	1.12
+++ ultrapossum/module/server/Makefile.am	2004/09/28 14:22:54	1.13
@@ -4,6 +4,7 @@
 include ../ultrapossum.am.in
 
 module_DATA = 10server
+modulesysconf_DATA = server.cf
 update_SCRIPTS = update-server
 
 modulelocal_SCRIPTS = startup 2.0 2.1 \
@@ -28,18 +29,13 @@
 	$(mkinstalldirs) $(DESTDIR)/$(localstatedir)/lib/$(PACKAGE)/conf.d
 	$(mkinstalldirs) $(DESTDIR)/$(pkgdatadir)/apps.d
 	$(mkinstalldirs) $(DESTDIR)/$(localstatedir)/backups/$(PACKAGE)
-	test -f $(DESTDIR)/$(sysconfdir)/$(PACKAGE)/secret.cf || \
-	( $(INSTALL_DATA) $(srcdir)/secret.cf \
+	$(INSTALL_DATA) $(srcdir)/secret.cf \
 		$(DESTDIR)/$(sysconfdir)/$(PACKAGE); \
-	chmod 660 $(DESTDIR)/$(sysconfdir)/$(PACKAGE)/secret.cf )
+	chmod 660 $(DESTDIR)/$(sysconfdir)/$(PACKAGE)/secret.cf
 	$(mkinstalldirs) $(DESTDIR)/$(sysconfdir)/$(PACKAGE)/module.d/
-	test -f $(DESTDIR)/$(sysconfdir)/$(PACKAGE)/module.d/server.cf || \
-		$(INSTALL_DATA) $(srcdir)/server.cf \
-			$(DESTDIR)/$(sysconfdir)/$(PACKAGE)/module.d/
 	for p in $(TEMPLATES); do \
-		test -f $(DESTDIR)/$(sysconfdir)/$(PACKAGE)/in.d/$$p || \
-			$(INSTALL_DATA) $(srcdir)/$$p \
-				$(DESTDIR)/$(sysconfdir)/$(PACKAGE)/in.d/; \
+		$(INSTALL_DATA) $(srcdir)/$$p \
+			$(DESTDIR)/$(sysconfdir)/$(PACKAGE)/in.d/; \
 	done
 
 EXTRA_DIST = update-server \
===================================================================
RCS file: ultrapossum/module/server/pid,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ultrapossum/module/server/pid	2004/06/22 15:28:32	1.3
+++ ultrapossum/module/server/pid	2004/09/28 14:22:54	1.4
@@ -2,6 +2,8 @@
 
 set -e
 
+tick="1 2 3 4 5 6 7 8 9 10"
+
 # status <pidfile>
 status_pid() {
   if test -f $1; then
@@ -27,7 +29,7 @@
     return 0
   fi
 
-  (for i in 1 2 3 4 5 6 7 8 9 10
+  ( for i in $tick
   do
     sleep $i
     if test "`status_pid $1`" = "running"; then
@@ -50,7 +52,7 @@
         if test -f $1; then /bin/rm -f $1; fi
         return 0
       fi
-      (for i in 1 2 3 4 5 6 7 8 9 10
+      (for i in $tick
       do
         echo -n "." 1>&2
         if ! test -d /proc/$PID; then


From taru ¡÷ users.sourceforge.jp  Tue Sep 28 23:22:53 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Tue, 28 Sep 2004 23:22:53 +0900
Subject: [Ultrapossum-cvs 608] ultrapossum/module/failover ...
Message-ID: <20040928142253.EFB632AC01D@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/failover/11failover,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ultrapossum/module/failover/11failover	2004/09/17 02:56:22	1.4
+++ ultrapossum/module/failover/11failover	2004/09/28 14:22:53	1.5
@@ -28,6 +28,7 @@
 # Failover configuration for slurpd
 ULTRAPOSSUM_RECOVERY_CONFIN=$(ultrapossum_getconf ULTRAPOSSUM_RECOVERY_CONFIN $TEMPLATEDIR/recovery.conf.in)
 ULTRAPOSSUM_RECOVERY_CONF=$(ultrapossum_getconf ULTRAPOSSUM_RECOVERY_CONF $CONFDIR/recovery.conf)
+FAILOVER_RECOVERY_PIDFILE=$(ultrapossum_getconf FAILOVER_RECOVERY_PIDFILE "$localstatedir/run/ultrapossum.recovery.pid")
 
 # Mon configuration
 ULTRAPOSSUM_MON_CFIN=$(ultrapossum_getconf ULTRAPOSSUM_MON_CFIN $TEMPLATEDIR/ultrapossum.mon.cf.in)
@@ -86,6 +87,7 @@
 
 if test -f "$HACF"; then
   HEARTBEAT_NICE_FAILBACK=`grep ^nice_failback $HACF | awk -F' ' '{print $2;}'`
+  HEARTBEAT_AUTO_FAILBACK=`grep ^auto_failback $HACF | awk -F' ' '{print $2;}'`
 fi
 
 if test "x$HOST" = "x$BACKUP"; then
@@ -97,19 +99,7 @@
 if test "x$ULTRAPOSSUM_MODULE_FAILOVER" = "xinstalled"; then
 
 wait_master_service() {
-  (for i in 1 2 2 3 3 3 5 5 5 5 10 10 10 10 10 20 20 20
-    do
-      if test "`ldapmaster_status`" = "running"; then
-        exit 0
-      fi
-    if test "`$MODULEDIR/server/pid status $HAPIDFILE`" = "stopped"; then
-      exit 1
-    fi
-    sleep $i
-    echo -n "."
-    done
-    echo "timeout" 1>&2
-    exit 1) || exit 1
+  $MODULEDIR/server/pid wait $SLAPD_PIDFILE
   echo -n " `basename $SLAPD`"
   if test "x$SLURPDSLAVES" != "x"; then
     $MODULEDIR/server/pid wait $SLURPD_PIDFILE
@@ -119,29 +109,24 @@
   echo -n " mon"
 }
 
-wait_nicefailback_service()
+wait_backup_service()
 {
+  # handle initdead case
   (for i in 1 2 2 3 3 3 5 5 5 5 10 10 10 10 10 20 20 20
-    do
-      if test "`$MODULEDIR/server/startup status`" = "running"; then
-        exit 0
-      fi
-    if test "`$MODULEDIR/server/pid status $HAPIDFILE`" = "stopped"; then
-      exit 1
+   do
+    # started as master service
+    if test "`ldapmaster_status`" = "running"; then
+      wait_master_service
+      exit 0
+    # started as slave service
+    elif test "`ldapslave_status`" = "running"; then
+      exit 0
     fi
     sleep $i
     echo -n "."
-    done
-    echo "timeout" 1>&2
-    exit 1) || exit 1
-  if test "`ldapmaster_status`" = "running"; then
-    wait_master_service
-  elif include "$BACKUP" "$SYNCBACKUPS"; then
-    echo -n " `basename $SLAPD`"
-  else   
-    echo -n " "
-    ldapslave_start
-  fi
+   done
+   echo "timeout" 1>&2
+   exit 1 ) || exit 1
 }
 
 ldapmaster_service_start()
@@ -149,16 +134,21 @@
   if test "x$BACKUP" = "x" ; then
     ldapmaster_start
   else
-    if include "$BACKUP" "$SYNCBACKUPS"; then
+    if test "x`$MODULEDIR/server/startup slave_status`" = "xstopped"; then
       ldapslave_start
       echo -n " "
     fi
     /etc/init.d/heartbeat start | grep ERROR 1>&2 && exit 1
+    $MODULEDIR/server/pid wait $HAPIDFILE
     echo -n "heartbeat"
-    if test "x$HOST" = "x$MASTER" && test "x$HEARTBEAT_NICE_FAILBACK" = "x"; then
-      wait_master_service
+    if test "x$HOST" = "x$MASTER"; then
+      if test "x$HEARTBEAT_NICE_FAILBACK" = "x" || test "x$HEARTBEAT_AUTO_FAILBACK" = "xon"; then
+        wait_master_service
+      else
+        wait_backup_service
+      fi
     else
-      wait_nicefailback_service
+      wait_backup_service
     fi
   fi
 }
===================================================================
RCS file: ultrapossum/module/failover/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ultrapossum/module/failover/Makefile.am	2004/06/24 08:42:59	1.4
+++ ultrapossum/module/failover/Makefile.am	2004/09/28 14:22:53	1.5
@@ -6,7 +6,6 @@
 
 module_DATA = 11failover
 update_SCRIPTS = update-failover
-
 modulesysconf_DATA = failover.cf
 
 modulelocal_SCRIPTS = \
===================================================================
RCS file: ultrapossum/module/failover/ha.cf.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ultrapossum/module/failover/ha.cf.in	2004/03/13 14:25:54	1.1.1.1
+++ ultrapossum/module/failover/ha.cf.in	2004/09/28 14:22:53	1.2
@@ -1,7 +1,17 @@
 #
 #	There are lots of options in this file.  All you have to have is a set
-#	of nodes listedJ {"node ...}
-#	and one of {serial, udp, or mcast}
+#	of nodes listed {"node ...} one of {serial, bcast, mcast, or ucast},
+#	and a value for "auto_failback".
+#
+#	ATTENTION: As the configuration file is read line by line,
+#		   THE ORDER OF DIRECTIVE MATTERS!
+#
+#	In particular, make sure that the udpport, serial baud rate
+#	etc. are set before the heartbeat media are defined!
+#	debug and log file directives go into effect when they
+#	are encountered.
+#
+#	All will be fine if you keep them ordered as in this example.
 #
 #
 #       Note on logging:
@@ -14,7 +24,7 @@
 #       defined then defaults will be used for debugfile and logfile as
 #       required and messages will be sent there.
 #
-#	File to wirte debug messages to
+#	File to write debug messages to
 #debugfile /var/log/ha-debug
 #
 #
@@ -25,16 +35,34 @@
 #
 #	Facility to use for syslog()/logger 
 #
-#logfacility	local0
+logfacility	local0
+#
 #
+#	A note on specifying "how long" times below...
 #
-#	keepalive: how many seconds between heartbeats
+#	The default time unit is seconds
+#		10 means ten seconds
+#
+#	You can also specify them in milliseconds
+#		1500ms means 1.5 seconds
+#
+#
+#	keepalive: how long between heartbeats?
 #
 #keepalive 2
 #
-#	deadtime: seconds-to-declare-host-dead
+#	deadtime: how long-to-declare-host-dead?
+#
+#		If you set this too low you will get the problematic
+#		split-brain (or cluster partition) problem.
+#		See the FAQ for how to use warntime to tune deadtime.
 #
-#deadtime 10
+#deadtime 30
+#
+#	warntime: how long before issuing "late heartbeat" warning?
+#	See the FAQ for how to use warntime to tune deadtime.
+#
+#warntime 10
 #
 #
 #	Very first dead time (initdead)
@@ -46,24 +74,27 @@
 #
 #initdead 120
 #
-#	hopfudge maximum hop count minus number of nodes in config
-#hopfudge 1
-#	
-#	serial	serialportname ...
-#serial	/dev/ttyS0
 #
+#	What UDP port to use for bcast/ucast communication?
+#
+#udpport	694
 #
 #	Baud rate for serial ports...
 #
 #baud	19200
+#	
+#	serial	serialportname ...
+#serial	/dev/ttyS0	# Linux
+#serial	/dev/cuaa0	# FreeBSD
+#serial	/dev/cua/a	# Solaris
 #
-#	What UDP port to use for communication?
-#
-#udpport	694
 #
-#	What interfaces to heartbeat over?
+#	What interfaces to broadcast heartbeats over?
 #
-#udp	eth0
+#bcast	eth0		# Linux
+#bcast	eth1 eth2	# Linux
+#bcast	le0		# Solaris
+#bcast	le1 le2		# Solaris
 #
 #	Set up a multicast heartbeat medium
 #	mcast [dev] [mcast group] [port] [ttl] [loop]
@@ -71,23 +102,65 @@
 #	[dev]		device to send/rcv heartbeats on
 #	[mcast group]	multicast group to join (class D multicast address
 #			224.0.0.0 - 239.255.255.255)
-#	[port]		udp port to sendto/rcvfrom (no real reason to differ
-#			from the port used for broadcast heartbeats)
+#	[port]		udp port to sendto/rcvfrom (set this value to the
+#			same value as "udpport" above)
 #	[ttl]		the ttl value for outbound heartbeats.  this effects
 #			how far the multicast packet will propagate.  (0-255)
+#			Must be greater than zero.
 #	[loop]		toggles loopback for outbound multicast heartbeats.
 #			if enabled, an outbound packet will be looped back and
 #			received by the interface it was sent on. (0 or 1)
+#			Set this value to zero.
 #		
 #
-#mcast eth0 225.0.0.1 694 1 1
+#mcast eth0 225.0.0.1 694 1 0
+#
+#	Set up a unicast / udp heartbeat medium
+#	ucast [dev] [peer-ip-addr]
+#
+#	[dev]		device to send/rcv heartbeats on
+#	[peer-ip-addr]	IP address of peer to send packets to
+#
+#ucast eth0 192.168.1.2
+#
+#
+#	About boolean values...
+#
+#	Any of the following case-insensitive values will work for true:
+#		true, on, yes, y, 1
+#	Any of the following case-insensitive values will work for false:
+#		false, off, no, n, 0
 #
-#	Watchdog is the watchdog timer.  If our own heart doesn't beat for
-#	a minute, then our machine will reboot.
 #
-#watchdog /dev/watchdog
 #
-#       "Legacy" STONITH support
+#	auto_failback:  determines whether a resource will
+#	automatically fail back to its "primary" node, or remain
+#	on whatever node is serving it until that node fails, or
+#	an administrator intervenes.
+#
+#	The possible values for auto_failback are:
+#		on	- enable automatic failbacks
+#		off	- disable automatic failbacks
+#		legacy	- enable automatic failbacks in systems
+#			where all nodes do not yet support
+#			the auto_failback option.
+#
+#	auto_failback "on" and "off" are backwards compatible with the old
+#		"nice_failback on" setting.
+#
+#	See the FAQ for information on how to convert
+#		from "legacy" to "on" without a flash cut.
+#		(i.e., using a "rolling upgrade" process)
+#
+#	The default value for auto_failback is "legacy", which
+#	will issue a warning at startup.  So, make sure you put
+#	an auto_failback directive in your ha.cf file.
+#	(note: auto_failback can be any boolean or "legacy")
+#
+#auto_failback on
+#
+#
+#       Basic STONITH support
 #       Using this directive assumes that there is one stonith 
 #       device in the cluster.  Parameters to this device are 
 #       read from a configuration file. The format of this line is:
@@ -97,8 +170,6 @@
 #       NOTE: it is up to you to maintain this file on each node in the
 #       cluster!
 #
-#nice_failback	on
-#
 #stonith baytech /etc/ha.d/conf/stonith.baytech
 #
 #       STONITH support
@@ -118,12 +189,99 @@
 #	here, and you make this file publically readable, you're asking
 #	for a denial of service attack ;-)
 #
+#	To get a list of supported stonith devices, run
+#		stonith -L
+#	For detailed information on which stonith devices are supported
+#	and their detailed configuration options, run this command:
+#		stonith -h
 #
 #stonith_host *     baytech 10.0.0.3 mylogin mysecretpassword
 #stonith_host ken3  rps10 /dev/ttyS1 kathy 0 
 #stonith_host kathy rps10 /dev/ttyS1 ken3 0 
+#
+#	Watchdog is the watchdog timer.  If our own heart doesn't beat for
+#	a minute, then our machine will reboot.
+#	NOTE: If you are using the software watchdog, you very likely
+#	wish to load the module with the parameter "nowayout=0" or
+#	compile it without CONFIG_WATCHDOG_NOWAYOUT set. Otherwise even
+#	an orderly shutdown of heartbeat will trigger a reboot, which is
+#	very likely NOT what you want.
+#
+#watchdog /dev/watchdog
 #       
 #	Tell what machines are in the cluster
 #	node	nodename ...	-- must match uname -n
 #node	ken3
 #node	kathy
+#
+#	Less common options...
+#
+#	Treats 10.10.10.254 as a psuedo-cluster-member
+#	Used together with ipfail below...
+#
+#ping 10.10.10.254
+#
+#	Treats 10.10.10.254 and 10.10.10.253 as a psuedo-cluster-member
+#       called group1. If either 10.10.10.254 or 10.10.10.253 are up
+#       then group1 is up
+#	Used together with ipfail below...
+#
+#ping_group group1 10.10.10.254 10.10.10.253
+#
+#	Processes started and stopped with heartbeat.  Restarted unless
+#		they exit with rc=100
+#
+#respawn userid /path/name/to/run
+#respawn hacluster /usr/lib/heartbeat/ipfail
+#
+#	Access control for client api
+#       	default is no access
+#
+#apiauth client-name gid=gidlist uid=uidlist
+#apiauth ipfail gid=haclient uid=hacluster
+
+###########################
+#
+#	Unusual options.
+#
+###########################
+#
+#	hopfudge maximum hop count minus number of nodes in config
+#hopfudge 1
+#
+#	deadping - dead time for ping nodes
+#deadping 30
+#
+#	hbgenmethod - Heartbeat generation number creation method
+#		Normally these are stored on disk and incremented as needed.
+#hbgenmethod time
+#
+#	realtime - enable/disable realtime execution (high priority, etc.)
+#		defaults to on
+#realtime off
+#
+#	debug - set debug level
+#		defaults to zero
+#debug 1
+#
+#	API Authentication - replaces the fifo-permissions-based system of the past
+#
+#
+#	You can put a uid list and/or a gid list.
+#	If you put both, then a process is authorized if it qualifies under either
+#	the uid list, or under the gid list.
+#
+#	The groupname "default" has special meaning.  If it is specified, then
+#	this will be used for authorizing groupless clients, and any client groups
+#	not otherwise specified.
+#
+#apiauth	ipfail uid=hacluster
+#apiauth ccm uid=hacluster
+#apiauth ping gid=haclient uid=alanr,root
+#apiauth default gid=haclient
+
+# message format in the wire, it can be classic or netstring, default is classic
+#msgfmt  netstring
+
+
+
===================================================================
RCS file: ultrapossum/module/failover/recovery,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ultrapossum/module/failover/recovery	2004/06/22 10:10:07	1.4
+++ ultrapossum/module/failover/recovery	2004/09/28 14:22:53	1.5
@@ -93,3 +93,4 @@
 	rm -rf $TMPDIR/$TMPRPL
     fi
 fi
+


From taru ¡÷ users.sourceforge.jp  Wed Sep 29 16:29:43 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 29 Sep 2004 16:29:43 +0900
Subject: [Ultrapossum-cvs 609] demo/uml 1.4,1.5,map 1.3,1.4,shutdown
Message-ID: <20040929072943.D2D762AC06D@users.sourceforge.jp>

===================================================================
RCS file: demo/uml/map,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- demo/uml/map	2004/09/27 15:15:45	1.4
+++ demo/uml/map	2004/09/29 07:29:43	1.5
@@ -2,6 +2,10 @@
 
 set -e
 
+WIDTH=8
+NETMASK=29
+NETPREFIX=192.168.1
+
 if test "x$1" = "x"; then
   echo "$0 <server>" 1>&2
   exit 1
@@ -42,12 +46,12 @@
   fi
 fi
 
-n=`echo \(  $id - 1 \) \* 4 | bc`
+n=`echo \(  $id - 1 \) \* $WIDTH | bc`
 
-echo "net=192.168.1.$n/30"
-echo "bcast=192.168.1.`expr $n + 3`"
-echo "host=192.168.1.`expr $n + 1`"
-echo "uml=192.168.1.`expr $n + 2`"
+echo "net=$NETPREFIX.$n/$NETMASK"
+echo "bcast=$NETPREFIX.`expr $n + $WIDTH - 1`"
+echo "host=$NETPREFIX.`expr $n + 1`"
+echo "uml=$NETPREFIX.`expr $n + 2`"
 echo "host_if=tap$id"
 echo "ultrapossum_packages='$pkgs'"
 echo "local_gateway=$local_gateway"
===================================================================
RCS file: demo/uml/shutdown,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- demo/uml/shutdown	2004/09/27 17:31:34	1.3
+++ demo/uml/shutdown	2004/09/29 07:29:43	1.4
@@ -23,7 +23,7 @@
 if test "$nowait" = "1"; then
   exit 0
 fi
-for s in 5 5 4 4 3 3 2 2 1 1 1
+for s in 5 5 5 4 4 4 3 3 3 2 2 2 1 1 1
 do
   if ! include "$1" "`$MODULEDIR/uml/runlist`"; then
     exit 0


From taru ¡÷ users.sourceforge.jp  Wed Sep 29 16:29:43 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 29 Sep 2004 16:29:43 +0900
Subject: [Ultrapossum-cvs 610] demo/uml/debian 1.4,1.5,init.d
Message-ID: <20040929072943.E4D2B2AC0AE@users.sourceforge.jp>

===================================================================
RCS file: demo/uml/debian/init.d,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- demo/uml/debian/init.d	2004/09/27 17:34:22	1.4
+++ demo/uml/debian/init.d	2004/09/29 07:29:43	1.5
@@ -26,6 +26,8 @@
 eval `ultrapossum-config init`
 trap "eval `ultrapossum-config term`" 0
 
+if test "x$UML_HOSTS" = "x"; then exit 0; fi
+
 case "$1" in
   start)
 	echo -n "Starting $DESC:"


From taru ¡÷ users.sourceforge.jp  Wed Sep 29 17:52:13 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 29 Sep 2004 17:52:13 +0900
Subject: [Ultrapossum-cvs 611] demo/uml ...
Message-ID: <20040929085213.6B6A12AC06D@users.sourceforge.jp>

===================================================================
RCS file: demo/uml/20uml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- demo/uml/20uml	2004/09/27 15:15:45	1.5
+++ demo/uml/20uml	2004/09/29 08:52:13	1.6
@@ -33,9 +33,9 @@
   UML_ULTRAPOSSUM_APT=$(ultrapossum_getconf UML_ULTRAPOSSUM_APT "http://ultrapossum.org/debian/ ./")
   UML_ULTRAMONKEY_APT=$(ultrapossum_getconf UML_ULTRAMONKEY_APT "http://www.ultramonkey.org/download/2.0.1/ sid main")
   UML_MEM=$(ultrapossum_getconf UML_MEM "64M")
-  UML_ULTRAPOSSUM_EXTRA_PACKAGES=$(ultrapossum_getconf UML_ULTRAPOSSUM_EXTRA_PACKAGES "")
   UML_MULTICASTADDR=$(ultrapossum_getconf UML_MULTICASTADDR "")
   UML_LOCALNETPREFIX=$(ultrapossum_getconf UML_LOCALNETPREFIX "192.168.0")
+  UML_CONFDIR=$(ultrapossum_getconf UML_CONFDIR "$SYSCONFDIR/uml")
 fi
 
 # Parsing configuration file
===================================================================
RCS file: demo/uml/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- demo/uml/Makefile.am	2004/09/27 15:15:45	1.2
+++ demo/uml/Makefile.am	2004/09/29 08:52:13	1.3
@@ -11,16 +11,22 @@
 template_DATA = rootstrap.conf.in
 
 modulelocal_SCRIPTS = map rootstrap.sh uml-run createrootfs.sh \
-	shutdown boot runlist
+	shutdown boot runlist selections map.cf
 
 rootstrapmodulesdir = $(sysconfdir)/rootstrap/modules
 rootstrapmodules_SCRIPTS = ultrapossum
 
+install-data-local:
+	$(mkinstalldirs) $(DESTDIR)/$(sysconfdir)/ultrapossum/uml/
+
 EXTRA_DIST = \
 	update-uml \
 	20uml \
 	rootstrap.conf.in \
 	boot \
 	shutdown \
-	runlist
+	runlist \
+	selections \
+	map.cf
+
 
===================================================================
RCS file: demo/uml/boot,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- demo/uml/boot	2004/09/27 15:15:45	1.11
+++ demo/uml/boot	2004/09/29 08:52:13	1.12
@@ -29,7 +29,6 @@
 
 if include $1 "`$MODULEDIR/uml/runlist`"
 then
-  echo "$1 already booted" 1>&2
   exit 0
 fi
 
===================================================================
RCS file: demo/uml/map,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- demo/uml/map	2004/09/29 07:29:43	1.5
+++ demo/uml/map	2004/09/29 08:52:13	1.6
@@ -33,11 +33,11 @@
 id=`num`
 
 if include "$arg" "$ULTRAMONKEYNODES"; then
-  pkgs="ultrapossum-ultramonkey"
-else
-  pkgs="ultrapossum"
+  suggests="ultrapossum-ultramonkey"
+elif include "$arg" "$MASTER $SLAVES"; then
+  suggests="ultrapossum"
   if test "x$BACKUP" != "x" && include "$arg" "$MASTER $BACKUP"; then
-    pkgs="$pkgs ultrapossum-failover"
+    suggests="$suggests ultrapossum-failover"
   fi
   if include "$arg" "$SLAVES" && test "x$ULTRAMONKEYNODES" != "x"; then
     eval "`$0 $(echo $ULTRAMONKEYNODES | head -1)`"
@@ -46,6 +46,10 @@
   fi
 fi
 
+if test -f "$UML_CONFDIR/$arg/map.cf"; then
+ . $UML_CONFDIR/$arg/map.cf
+fi
+
 n=`echo \(  $id - 1 \) \* $WIDTH | bc`
 
 echo "net=$NETPREFIX.$n/$NETMASK"
@@ -53,8 +57,8 @@
 echo "host=$NETPREFIX.`expr $n + 1`"
 echo "uml=$NETPREFIX.`expr $n + 2`"
 echo "host_if=tap$id"
-echo "ultrapossum_packages='$pkgs'"
 echo "local_gateway=$local_gateway"
 echo "local_net=$UML_LOCALNETPREFIX.$id"
 echo "local_host=$local_host"
+echo "suggests='$suggests'"
 
===================================================================
RCS file: demo/uml/rootstrap.conf.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- demo/uml/rootstrap.conf.in	2004/09/27 15:15:45	1.6
+++ demo/uml/rootstrap.conf.in	2004/09/29 08:52:13	1.7
@@ -116,7 +116,6 @@
 [ultrapossum]
 ultrapossum_apt=#UML_ULTRAPOSSUM_APT#
 ultramonkey_apt=#UML_ULTRAMONKEY_APT#
-ultrapossum_packages=#ULTRAPOSSUM_PACKAGES#
 ultrapossum_hosts=#ULTRAPOSSUM_HOSTS#
 ultrapossum_local_net=#ULTRAPOSSUM_LOCALNET#
 ultrapossum_localnet=#UML_LOCALNETPREFIX#.0/24
===================================================================
RCS file: demo/uml/rootstrap.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- demo/uml/rootstrap.sh	2004/09/27 15:15:45	1.5
+++ demo/uml/rootstrap.sh	2004/09/29 08:52:13	1.6
@@ -19,7 +19,6 @@
 	-e "s/#UML_NAMESERVER#/$UML_NAMESERVER/" \
 	-e "s!#UML_ULTRAPOSSUM_APT#!$UML_ULTRAPOSSUM_APT!" \
 	-e "s!#UML_ULTRAMONKEY_APT#!$UML_ULTRAMONKEY_APT!" \
-	-e "s/#ULTRAPOSSUM_PACKAGES#/$UML_ULTRAPOSSUM_EXTRA_PACKAGES $ultrapossum_packages/" \
 	-e "s!#ULTRAPOSSUM_HOSTS#!$UMLDIR/hosts!" \
 	-e "s/#ULTRAPOSSUM_LOCALGATEWAY#/$local_gateway/" \
 	-e "s/#ULTRAPOSSUM_LOCALNET#/$local_net/" \
===================================================================
RCS file: demo/uml/ultrapossum,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- demo/uml/ultrapossum	2004/09/27 16:55:05	1.8
+++ demo/uml/ultrapossum	2004/09/29 08:52:13	1.9
@@ -54,4 +54,9 @@
 sed 's!^ca.*!ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -h now!' $TARGET/etc/inittab > $TARGET/etc/inittabT
 mv $TARGET/etc/inittabT $TARGET/etc/inittab
 
-chroot $TARGET /bin/sh -c "apt-get update && apt-get -y -o DPkg::Options::="--force-confold" -f install $ultrapossum_packages && run-parts --arg=stop /etc/init.d/"
+host=`hostname`
+selections=/etc/ultrapossum/uml/$host/selections
+if test -f "$TARGET/$selections"; then
+  chroot $TARGET /bin/sh -c "dpkg --set-selections < $selections && apt-get update && apt-get -y -o DPkg::Options::="--force-confold" dselect-upgrade && run-parts --arg=stop /etc/init.d/"
+fi
+
===================================================================
RCS file: demo/uml/uml.cf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- demo/uml/uml.cf	2004/09/27 15:15:45	1.3
+++ demo/uml/uml.cf	2004/09/29 08:52:13	1.4
@@ -14,7 +14,5 @@
 
 #UML_MEM="64M"
 
-#UML_ULTRAPOSSUM_EXTRA_PACKAGES="ultrapossum-snmp ultrapossum-slapd"
-
 #UML_LOCALNETPREFIX="192.168.0"
 
===================================================================
RCS file: demo/uml/update-uml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- demo/uml/update-uml	2004/09/27 09:09:50	1.15
+++ demo/uml/update-uml	2004/09/29 08:52:13	1.16
@@ -32,6 +32,10 @@
   add_startmark "##" "$id" > $tmp
   for h in $UML_HOSTS
   do
+    if ! test -f "$UML_CONFDIR/$h/map.cf"; then
+      install -d "$UML_CONFDIR/$h"
+      /bin/cp $MODULEDIR/uml/map.cf $UML_CONFDIR/$h/map.cf
+    fi
     eval "`$MODULEDIR/uml/map $h`"
     install -d $UMLDIR/$h
     $MODULEDIR/uml/rootstrap.sh $h > $UMLDIR/$h/rootstrap.conf
@@ -41,6 +45,13 @@
       echo "$uml $h" >> $UMLDIR/hosts
     fi
     echo "$uml $h" >> $tmp
+    if ! test -f "$UML_CONFDIR/$h/selections"; then
+      /bin/cp $MODULEDIR/uml/selections $UML_CONFDIR/$h/selections
+      for s in $suggests
+      do
+        echo "$s				install" >> $UML_CONFDIR/$h/selections
+      done
+    fi
   done
 
   add_endmark "##" "$id" >> $tmp
@@ -105,13 +116,6 @@
       echo "E: No write permission to /dev/net/tun for $UML_USER" 1>&2
       exit 1
     fi
-    for h in $UML_HOSTS
-    do
-      if ! include "$h" "$MASTER $SLAVES $ULTRAMONKEYNODES"; then
-        echo "Unknown host: $h" 1>&2
-	exit 1
-      fi
-    done
   fi
 }
 


From taru ¡÷ users.sourceforge.jp  Wed Sep 29 18:18:16 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 29 Sep 2004 18:18:16 +0900
Subject: [Ultrapossum-cvs 612] demo/uml 1.16,1.17,update-uml
Message-ID: <20040929091816.6251D2AC03E@users.sourceforge.jp>

===================================================================
RCS file: demo/uml/update-uml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- demo/uml/update-uml	2004/09/29 08:52:13	1.16
+++ demo/uml/update-uml	2004/09/29 09:18:16	1.17
@@ -36,7 +36,8 @@
       install -d "$UML_CONFDIR/$h"
       /bin/cp $MODULEDIR/uml/map.cf $UML_CONFDIR/$h/map.cf
     fi
-    eval "`$MODULEDIR/uml/map $h`"
+    $MODULEDIR/uml/map $h > $UMLDIR/$h/map
+    source_shell "$UMLDIR/$h/map"
     install -d $UMLDIR/$h
     $MODULEDIR/uml/rootstrap.sh $h > $UMLDIR/$h/rootstrap.conf
     if test "x$local_net" != "x"; then
@@ -60,7 +61,10 @@
   for h in $MASTER $SLAVES
   do 
     if ! include $h "$UML_HOSTS"; then
-      echo "`getip $h`" $h >> $UMLDIR/hosts
+      ip=`getip $h`
+      if test "x$ip" != "x"; then
+        echo "$ip $h" >> $UMLDIR/hosts
+      fi
     fi
   done
   if test "x$MASTER" = "x$HOST"; then


From taru ¡÷ users.sourceforge.jp  Wed Sep 29 18:19:58 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 29 Sep 2004 18:19:58 +0900
Subject: [Ultrapossum-cvs 613] demo/uml 1.6,1.7,map
Message-ID: <20040929091958.C8CA82AC03E@users.sourceforge.jp>

===================================================================
RCS file: demo/uml/map,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- demo/uml/map	2004/09/29 08:52:13	1.6
+++ demo/uml/map	2004/09/29 09:19:58	1.7
@@ -35,7 +35,7 @@
 if include "$arg" "$ULTRAMONKEYNODES"; then
   suggests="ultrapossum-ultramonkey"
 elif include "$arg" "$MASTER $SLAVES"; then
-  suggests="ultrapossum"
+  suggests="ultrapossum ultrapossum-snmp"
   if test "x$BACKUP" != "x" && include "$arg" "$MASTER $BACKUP"; then
     suggests="$suggests ultrapossum-failover"
   fi


From taru ¡÷ users.sourceforge.jp  Wed Sep 29 20:48:28 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 29 Sep 2004 20:48:28 +0900
Subject: [Ultrapossum-cvs 614] ultrapossum/module/failover 1.5,1.6,11failover
Message-ID: <20040929114828.528FE2AC03C@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/failover/11failover,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ultrapossum/module/failover/11failover	2004/09/28 14:22:53	1.5
+++ ultrapossum/module/failover/11failover	2004/09/29 11:48:28	1.6
@@ -63,10 +63,6 @@
 
 if test "x$cache" = "x"; then
 
-if test "x$VIRTUAL" != "x" && test "x$BACKUP" != "x"; then
-  LDAPMASTER="$VIRTUAL"
-fi
-
 if test "x$BACKUP" != "x" && test "x$NFSDIR" != "x"; then
   LOCAL_REPLOGFILE=$REPLOGFILE
   REPLOGFILE=$NFSDIR/$RPLDIR/$HOST/replog


From taru ¡÷ users.sourceforge.jp  Wed Sep 29 20:48:47 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 29 Sep 2004 20:48:47 +0900
Subject: [Ultrapossum-cvs 615] ultrapossum/debian 1.62,1.63,changelog
Message-ID: <20040929114847.831C02AC03C@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/changelog,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- ultrapossum/debian/changelog	2004/09/27 16:35:44	1.62
+++ ultrapossum/debian/changelog	2004/09/29 11:48:47	1.63
@@ -1,3 +1,9 @@
+ultrapossum (0.1beta11-0pre5) unstable; urgency=low
+
+  * Applied the latest upstream version.
+
+ -- Masato Taruishi <taru ¡÷ valinux.co.jp>  Wed, 29 Sep 2004 20:46:59 +0900
+
 ultrapossum (0.1beta11-0pre4) unstable; urgency=low
 
   * Applied the latest upstream version.


From taru ¡÷ users.sourceforge.jp  Wed Sep 29 20:57:02 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 29 Sep 2004 20:57:02 +0900
Subject: [Ultrapossum-cvs 616] ultrapossum/debian 1.63,1.64,changelog
Message-ID: <20040929115702.72CA12AC066@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/changelog,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- ultrapossum/debian/changelog	2004/09/29 11:48:47	1.63
+++ ultrapossum/debian/changelog	2004/09/29 11:57:02	1.64
@@ -1,3 +1,9 @@
+ultrapossum (0.1beta12-0pre1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Masato Taruishi <taru ¡÷ valinux.co.jp>  Wed, 29 Sep 2004 20:55:07 +0900
+
 ultrapossum (0.1beta11-0pre5) unstable; urgency=low
 
   * Applied the latest upstream version.


From taru ¡÷ users.sourceforge.jp  Wed Sep 29 21:15:03 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 29 Sep 2004 21:15:03 +0900
Subject: [Ultrapossum-cvs 617] ultrapossum/module/failover 1.5, 1.6,
	failover.cf
Message-ID: <20040929121503.16C422AC03C@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/failover/failover.cf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ultrapossum/module/failover/failover.cf	2004/04/12 04:35:49	1.5
+++ ultrapossum/module/failover/failover.cf	2004/09/29 12:15:03	1.6
@@ -14,7 +14,7 @@
 #NFSDIR="/var/autofs/misc/share"
 
 # Replication Log Directory
-#RPLDIR="$NFSDIR/service/ldap"
+#RPLDIR="/service/ldap"
 
 # time in second to check wether the LDAP service available
 #FAILOVER_LDAP_INTERVAL=10


From taru ¡÷ users.sourceforge.jp  Wed Sep 29 21:28:08 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 29 Sep 2004 21:28:08 +0900
Subject: [Ultrapossum-cvs 618] plugin/slapd/debian 1.6,1.7,control
Message-ID: <20040929122808.2F5E32AC029@users.sourceforge.jp>

===================================================================
RCS file: plugin/slapd/debian/control,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plugin/slapd/debian/control	2004/09/17 11:57:29	1.6
+++ plugin/slapd/debian/control	2004/09/29 12:28:08	1.7
@@ -9,7 +9,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, db4.2-util, ultrapossum-common
 Provides: slapd
-Conflicts: ultrapossum-server (<< 0.1beta6-0pre11)
+Conflicts: ultrapossum-server (<< 0.1beta10-0pre4)
 Description: UltraPossum plugin to use slapd optimized for UltraPossum
  This plugin enables you to use your own slapd program optimized for
  UltraPossum.


From taru ¡÷ users.sourceforge.jp  Wed Sep 29 21:30:57 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 29 Sep 2004 21:30:57 +0900
Subject: [Ultrapossum-cvs 619] ultrapossum/debian 1.5, 1.6,
	ultrapossum-common.postrm
Message-ID: <20040929123057.370BB2AC0B4@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/ultrapossum-common.postrm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ultrapossum/debian/ultrapossum-common.postrm	2004/07/13 08:16:43	1.5
+++ ultrapossum/debian/ultrapossum-common.postrm	2004/09/29 12:30:57	1.6
@@ -29,6 +29,8 @@
 	/bin/rmdir /etc/ultrapossum/apps/ 2> /dev/null || true
 	/bin/rmdir /etc/ultrapossum/in.d/ 2> /dev/null || true
 	/bin/rmdir /etc/ultrapossum/projects/ 2> /dev/null || true
+	/bin/rmdir /etc/ultrapossum/init.ldif.d/ 2> /dev/null || true
+	/bin/rmdir /etc/ultrapossum/module.d/ 2> /dev/null || true
 	/bin/rmdir /etc/ultrapossum/ 2> /dev/null || true
     	;;
     remove)


From taru ¡÷ users.sourceforge.jp  Wed Sep 29 21:55:38 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 29 Sep 2004 21:55:38 +0900
Subject: [Ultrapossum-cvs 620] ultrapossum 1.45, 1.46, modules.in 1.1, 1.2,
	sshman
Message-ID: <20040929125538.4633B2AC029@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/modules.in,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ultrapossum/modules.in	2004/09/15 12:17:50	1.45
+++ ultrapossum/modules.in	2004/09/29 12:55:38	1.46
@@ -56,6 +56,7 @@
 APPSCONFDIR=${APPSCONFDIR:-$SYSCONFDIR/apps}
 TEMPLATEDIR=${TEMPLATEDIR:-$SYSCONFDIR/in.d}
 MODULECONFDIR=${MODULECONFDIR:-$SYSCONFDIR/module.d}
+SSHKEYDIR=${SSHKEYDIR:-$SYSCONFDIR/ssh}
 
 CONFSTATUS=${CONFSTATUS:-$CONFDIR/status}
 ULTRAPOSSUMCF=${ULTRAPOSSUMCF:-$SYSCONFDIR/ultrapossum.cf}
===================================================================
RCS file: ultrapossum/sshman,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ultrapossum/sshman	2004/09/27 16:27:45	1.1
+++ ultrapossum/sshman	2004/09/29 12:55:38	1.2
@@ -19,7 +19,19 @@
   fi
 }
 
+#keyremove <cmd>
+keyremove() {
+  if ! test -f "$SSHKEYDIR/$1/id_rsa"; then
+    echo "No such key: $1" 1>&2
+    exit 1
+  fi
+  /bin/rm -f "$SSHKEYDIR/$1/id_rsa" "$SSHKEYDIR/$1/id_rsa.pub"
+  /bin/rmdir "$SSHKEYDIR/$1" 2> /dev/null || true
+  /bin/rmdir "$SSHKEYDIR/`dirname $1`" 2> /dev/null || true
+}
+
 list() {
+  install -m 750 -d $SSHKEYDIR
   ( cd $SSHKEYDIR
     find -name id_rsa | while read key
     do
@@ -53,22 +65,16 @@
 }
 
 case "x$1" in
-  xkeygen)
-    install -m 750 -d $SSHKEYDIR
+  xkeygen|xkeyremove)
     if test "x$2" = "x"; then
-      echo "Usage: $0 keygen <cmd>" 1>&2
+      echo "Usage: $0 $1 <cmd>" 1>&2
       exit 1
     fi
-    keygen "$2"
-    ;;
-  xlist)
-    list
-    ;;
-  xauth)
-    auth
+    if test "x$1" = "xkeygen"; then install -m 750 -d $SSHKEYDIR; fi
+    "$1" "$2"
     ;;
-  xunauth)
-    unauth
+  xlist|xauth|xunauth)
+    $1
     ;;
   xcmd)
     if test "x$3" = "x"; then
@@ -78,7 +84,7 @@
     cmd "$2" "$3"
     ;;
   x)
-    echo "Usage: $0 keygen <cmd>|list|auth|unauth|cmd <host> <cmd>" 1>&2
+    echo "Usage: $0 keygen <cmd>|keyremove <cmd>|list|auth|unauth|cmd <host> <cmd>" 1>&2
     ;;
   x*)
     echo "Unknown argument: $1" 1>&2


From taru ¡÷ users.sourceforge.jp  Wed Sep 29 21:55:38 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 29 Sep 2004 21:55:38 +0900
Subject: [Ultrapossum-cvs 621] ultrapossum/debian 1.6, 1.7,
	ultrapossum-common.postrm
Message-ID: <20040929125538.57E832AC03C@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/ultrapossum-common.postrm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ultrapossum/debian/ultrapossum-common.postrm	2004/09/29 12:30:57	1.6
+++ ultrapossum/debian/ultrapossum-common.postrm	2004/09/29 12:55:38	1.7
@@ -31,6 +31,7 @@
 	/bin/rmdir /etc/ultrapossum/projects/ 2> /dev/null || true
 	/bin/rmdir /etc/ultrapossum/init.ldif.d/ 2> /dev/null || true
 	/bin/rmdir /etc/ultrapossum/module.d/ 2> /dev/null || true
+	/bin/rmdir /etc/ultrapossum/ssh/ 2> /dev/null || true
 	/bin/rmdir /etc/ultrapossum/ 2> /dev/null || true
     	;;
     remove)


From taru ¡÷ users.sourceforge.jp  Wed Sep 29 21:55:38 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 29 Sep 2004 21:55:38 +0900
Subject: [Ultrapossum-cvs 622] ultrapossum/module/server ...
Message-ID: <20040929125538.7A2332AC0B4@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/server/10server,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ultrapossum/module/server/10server	2004/09/27 16:27:45	1.18
+++ ultrapossum/module/server/10server	2004/09/29 12:55:38	1.19
@@ -67,7 +67,6 @@
 INITLDIF=`ultrapossum_getconf INITLDIF $CONFDIR/init.ldif`
 
 INITLDIFDIR=`ultrapossum_getconf INITLDIFDIR $SYSCONFDIR/init.ldif.d`
-SSHKEYDIR=`ultrapossum_getconf SSHKEYDIR $SYSCONFDIR/ssh`
 
 # Default Configuration
 
===================================================================
RCS file: ultrapossum/module/server/update-server,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- ultrapossum/module/server/update-server	2004/09/27 17:08:17	1.52
+++ ultrapossum/module/server/update-server	2004/09/29 12:55:38	1.53
@@ -297,10 +297,8 @@
     strip_vaconf $SLAPDCONF "SCHEMA"
     strip_vaconf $SLAPDCONF "DB"
   fi
-  if test "x$SLAVES" = "x" || test "x$MASTER" != "x$HOST"; then
-    /bin/rm -rf $SSHKEYDIR/fetchldif/
-    $SHAREDIR/sshman auth
-  fi
+  $SHAREDIR/sshman keyremove server/fetchldif 2> /dev/null || true
+  $SHAREDIR/sshman auth
 }
 
 case "x$1" in


From taru ¡÷ users.sourceforge.jp  Wed Sep 29 21:59:08 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 29 Sep 2004 21:59:08 +0900
Subject: [Ultrapossum-cvs 623] ultrapossum/module/server 1.53, 1.54,
	update-server
Message-ID: <20040929125908.56F562AC029@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/server/update-server,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- ultrapossum/module/server/update-server	2004/09/29 12:55:38	1.53
+++ ultrapossum/module/server/update-server	2004/09/29 12:59:08	1.54
@@ -283,7 +283,7 @@
     SLURPDSLAVES=$oSLURPDSLAVES
   fi
   configure_slapd
-  if test "x$SLAVES" != "x" && test "x$MASTER" = "x$HOST"; then
+  if test "x$SLURPDSLAVES" != "x" && test "x$MASTER" = "x$HOST"; then
     $SHAREDIR/sshman keygen server/fetchldif
     $SHAREDIR/sshman auth
   fi


From taru ¡÷ users.sourceforge.jp  Wed Sep 29 22:39:15 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 29 Sep 2004 22:39:15 +0900
Subject: [Ultrapossum-cvs 624] plugin/snmp 1.5,1.6,Makefile.am
Message-ID: <20040929133915.30A222AC088@users.sourceforge.jp>

===================================================================
RCS file: plugin/snmp/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin/snmp/Makefile.am	2004/06/24 13:03:22	1.5
+++ plugin/snmp/Makefile.am	2004/09/29 13:39:15	1.6
@@ -13,7 +13,7 @@
 modulelocal_SCRIPTS = snmppass
 
 EXTRA_DIST = \
-	update-sasl \
+	update-snmp \
 	01snmp \
 	snmp.cf \
 	snmppass.d


From taru ¡÷ users.sourceforge.jp  Wed Sep 29 22:39:58 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 29 Sep 2004 22:39:58 +0900
Subject: [Ultrapossum-cvs 625] plugin/snmp ...
Message-ID: <20040929133958.4C7862AC088@users.sourceforge.jp>



From taru ¡÷ users.sourceforge.jp  Wed Sep 29 22:41:39 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 29 Sep 2004 22:41:39 +0900
Subject: [Ultrapossum-cvs 626] plugin/snmp 1.6,1.7,Makefile.am
Message-ID: <20040929134139.ABB672AC08C@users.sourceforge.jp>

===================================================================
RCS file: plugin/snmp/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plugin/snmp/Makefile.am	2004/09/29 13:39:15	1.6
+++ plugin/snmp/Makefile.am	2004/09/29 13:41:39	1.7
@@ -16,7 +16,9 @@
 	update-snmp \
 	01snmp \
 	snmp.cf \
-	snmppass.d
+	snmppass.d/README \
+	snmppass.d/operations \
+	snmppass.d/snmpgen
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)/$(modulelocaldir)/snmppass.d


From taru ¡÷ users.sourceforge.jp  Wed Sep 29 22:43:28 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 29 Sep 2004 22:43:28 +0900
Subject: [Ultrapossum-cvs 627] plugin/snmp/debian 1.4,1.5,control
Message-ID: <20040929134328.74B7F2AC08C@users.sourceforge.jp>

===================================================================
RCS file: plugin/snmp/debian/control,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin/snmp/debian/control	2004/07/03 13:47:40	1.4
+++ plugin/snmp/debian/control	2004/09/29 13:43:28	1.5
@@ -2,7 +2,7 @@
 Section: net
 Priority: optional
 Maintainer: Masato Taruishi <taru ¡÷ ultrapossum.org>
-Build-Depends: debhelper (>= 4.0.0)
+Build-Depends-Indep: debhelper (>= 4.0.0), ultrapossum-dev
 Standards-Version: 3.6.0
 
 Package: ultrapossum-snmp


From taru ¡÷ users.sourceforge.jp  Wed Sep 29 22:44:19 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 29 Sep 2004 22:44:19 +0900
Subject: [Ultrapossum-cvs 628] plugin/snmp/debian 1.5,1.6,control
Message-ID: <20040929134419.873502AC08C@users.sourceforge.jp>

===================================================================
RCS file: plugin/snmp/debian/control,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin/snmp/debian/control	2004/09/29 13:43:28	1.5
+++ plugin/snmp/debian/control	2004/09/29 13:44:19	1.6
@@ -2,7 +2,7 @@
 Section: net
 Priority: optional
 Maintainer: Masato Taruishi <taru ¡÷ ultrapossum.org>
-Build-Depends-Indep: debhelper (>= 4.0.0), ultrapossum-dev
+Build-Depends-Indep: debhelper (>= 4.0.0)
 Standards-Version: 3.6.0
 
 Package: ultrapossum-snmp


From taru ¡÷ users.sourceforge.jp  Wed Sep 29 22:45:13 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 29 Sep 2004 22:45:13 +0900
Subject: [Ultrapossum-cvs 629] plugin/snmp 1.7,1.8,Makefile.am
Message-ID: <20040929134513.C2CBA2AC08C@users.sourceforge.jp>

===================================================================
RCS file: plugin/snmp/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- plugin/snmp/Makefile.am	2004/09/29 13:41:39	1.7
+++ plugin/snmp/Makefile.am	2004/09/29 13:45:13	1.8
@@ -18,7 +18,8 @@
 	snmp.cf \
 	snmppass.d/README \
 	snmppass.d/operations \
-	snmppass.d/snmpgen
+	snmppass.d/snmpgen \
+	ultrapossum.am
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)/$(modulelocaldir)/snmppass.d


From taru ¡÷ users.sourceforge.jp  Wed Sep 29 22:51:19 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 29 Sep 2004 22:51:19 +0900
Subject: [Ultrapossum-cvs 630] plugin/sasl 1.3,1.4,Makefile.am
Message-ID: <20040929135119.3F22B2AC08C@users.sourceforge.jp>

===================================================================
RCS file: plugin/sasl/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin/sasl/Makefile.am	2004/09/23 06:21:18	1.3
+++ plugin/sasl/Makefile.am	2004/09/29 13:51:19	1.4
@@ -17,5 +17,6 @@
 	sasl-md5.in \
 	11sasl \
 	sasl-account \
-	sasl.cf
+	sasl.cf \
+	ultrapossum.am
 


From taru ¡÷ users.sourceforge.jp  Wed Sep 29 22:52:45 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Wed, 29 Sep 2004 22:52:45 +0900
Subject: [Ultrapossum-cvs 631] plugin/sasl/debian 1.5,1.6,control
Message-ID: <20040929135245.C7D9C2AC08C@users.sourceforge.jp>

===================================================================
RCS file: plugin/sasl/debian/control,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin/sasl/debian/control	2004/09/23 07:16:10	1.5
+++ plugin/sasl/debian/control	2004/09/29 13:52:45	1.6
@@ -2,7 +2,7 @@
 Section: net
 Priority: optional
 Maintainer: Masato Taruishi <taru ¡÷ ultrapossum.org>
-Build-Depends-Indep: debhelper (>= 4.0.0), ultrapossum-dev
+Build-Depends-Indep: debhelper (>= 4.0.0)
 Standards-Version: 3.6.0
 
 Package: ultrapossum-sasl


From taru ¡÷ users.sourceforge.jp  Thu Sep 30 01:47:00 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 30 Sep 2004 01:47:00 +0900
Subject: [Ultrapossum-cvs 632] ultrapossum 1.2,1.3,sshman
Message-ID: <20040929164700.A28872AC034@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/sshman,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ultrapossum/sshman	2004/09/29 12:55:38	1.2
+++ ultrapossum/sshman	2004/09/29 16:47:00	1.3
@@ -1,4 +1,19 @@
 #!/usr/bin/env bash
+#
+# Copyright (C) 2003 VA Linux Systems Japan, K.K. All rights reserved.
+#
+# LICENSE NOTICE
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
 
 set -e
 


From taru ¡÷ users.sourceforge.jp  Thu Sep 30 01:47:00 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 30 Sep 2004 01:47:00 +0900
Subject: [Ultrapossum-cvs 633] ultrapossum/config/ldap 1.2,1.3,mkldif
Message-ID: <20040929164700.BAC642AC037@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/config/ldap/mkldif,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ultrapossum/config/ldap/mkldif	2004/03/25 03:25:09	1.2
+++ ultrapossum/config/ldap/mkldif	2004/09/29 16:47:00	1.3
@@ -1,4 +1,19 @@
 #!/usr/bin/env bash
+#
+# Copyright (C) 2003 VA Linux Systems Japan, K.K. All rights reserved.
+#
+# LICENSE NOTICE
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
 
 eval `ultrapossum-config init`
 trap "eval `ultrapossum-config term`" 0


From taru ¡÷ users.sourceforge.jp  Thu Sep 30 01:50:48 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 30 Sep 2004 01:50:48 +0900
Subject: [Ultrapossum-cvs 634] ultrapossum/config/ldap 1.1,1.2,Makefile.am
Message-ID: <20040929165048.35B322AC037@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/config/ldap/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ultrapossum/config/ldap/Makefile.am	2004/03/24 13:53:58	1.1
+++ ultrapossum/config/ldap/Makefile.am	2004/09/29 16:50:48	1.2
@@ -1,5 +1,7 @@
 EXTRA_DIST = ultrapossum mkldif
 
+pkgdata_SCRIPTS = mkldif
+
 APPSDIR = ${pkgdatadir}/apps.d
 
 install-data-local:


From taru ¡÷ users.sourceforge.jp  Thu Sep 30 01:50:48 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 30 Sep 2004 01:50:48 +0900
Subject: [Ultrapossum-cvs 635] ultrapossum/debian 1.9, 1.10,
	ultrapossum-common.install
Message-ID: <20040929165048.60F7E2AC0B2@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/ultrapossum-common.install,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ultrapossum/debian/ultrapossum-common.install	2004/09/27 16:27:45	1.9
+++ ultrapossum/debian/ultrapossum-common.install	2004/09/29 16:50:48	1.10
@@ -2,6 +2,7 @@
 debian/tmp/usr/bin/ultrapossum-config
 debian/tmp/usr/share/ultrapossum/modules
 debian/tmp/usr/share/ultrapossum/sshman
+debian/tmp/usr/share/ultrapossum/mkldif
 debian/tmp/usr/share/ultrapossum/init.d
 debian/tmp/usr/share/ultrapossum/term
 debian/tmp/usr/share/ultrapossum/variable


From taru ¡÷ users.sourceforge.jp  Thu Sep 30 02:09:43 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 30 Sep 2004 02:09:43 +0900
Subject: [Ultrapossum-cvs 636] web 1.23,1.24,index.en.html
Message-ID: <20040929170943.1E4DA2AC034@users.sourceforge.jp>

===================================================================
RCS file: web/index.en.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- web/index.en.html	2004/07/03 05:00:44	1.23
+++ web/index.en.html	2004/09/29 17:09:43	1.24
@@ -91,6 +91,10 @@
 </pre>
 Just hit enter key when prompted for the CVS password.
 
+<p>
+daily tarball is available from <a href="http://ultrapossum.org/daily/">here</a>.
+</p>
+
 <h4>How to build</h4>
 
 <h5>Requirements</h5>


From taru ¡÷ users.sourceforge.jp  Thu Sep 30 02:10:51 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 30 Sep 2004 02:10:51 +0900
Subject: [Ultrapossum-cvs 637] web 1.24,1.25,index.en.html
Message-ID: <20040929171051.6DFEE2AC034@users.sourceforge.jp>

===================================================================
RCS file: web/index.en.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- web/index.en.html	2004/09/29 17:09:43	1.24
+++ web/index.en.html	2004/09/29 17:10:51	1.25
@@ -68,6 +68,9 @@
 <a href="http://osdn.dl.sourceforge.jp/ultrapossum/9462/ultrapossum-0.1beta6.tar.gz">ultrapossum-0.1beta6.tar.gz</a>
 </ul>
 <p>
+daily tarball is available from <a href="http://ultrapossum.org/daily/">here</a>.
+</p>
+<p>
 </p>
 <p>
 An apt repository is available for Debian users. Add the following to
@@ -90,10 +93,6 @@
  ~$ cvs -d :pserver:anonymous ¡÷ cvs.ultrapossum.org:/cvsroot/ultrapossum co ultrapossum
 </pre>
 Just hit enter key when prompted for the CVS password.
-
-<p>
-daily tarball is available from <a href="http://ultrapossum.org/daily/">here</a>.
-</p>
 
 <h4>How to build</h4>
 


From taru ¡÷ users.sourceforge.jp  Thu Sep 30 11:56:05 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 30 Sep 2004 11:56:05 +0900
Subject: [Ultrapossum-cvs 638] plugin/snmp 1.2,1.3,01snmp
Message-ID: <20040930025605.A328B2AC01F@users.sourceforge.jp>

===================================================================
RCS file: plugin/snmp/01snmp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin/snmp/01snmp	2004/06/24 12:42:37	1.2
+++ plugin/snmp/01snmp	2004/09/30 02:56:05	1.3
@@ -23,7 +23,7 @@
 # Defining Variables
 if test "x$cache" = "x"; then
   SNMP_COMMUNITY=$(ultrapossum_getconf SNMP_COMMUNITY "$PACKAGE")
-  SNMP_MIB=$(ultrapossum_getconf SNMP_MIB ".1.3.6.1.4.12345")
+  SNMP_MIB=$(ultrapossum_getconf SNMP_MIB ".1.3.6.1.4.1.14327.2.2.2.1")
   SNMPD_CONF_IN=$(ultrapossum_getconf SNMPD_CONF_IN "$TEMPLATEDIR/snmpd.conf.in")
   SNMPD_CONF=$(ultrapossum_getconf SNMPD_CONF "$sysconfdir/snmp/snmpd.conf")
   SNMPPASS=$(ultrapossum_getconf SNMPPASSDIR "$MODULEDIR/snmp/snmppass")


From taru ¡÷ users.sourceforge.jp  Thu Sep 30 11:56:50 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 30 Sep 2004 11:56:50 +0900
Subject: [Ultrapossum-cvs 639] plugin/sasl/debian 1.3,1.4,postinst
Message-ID: <20040930025650.5E5BB2AC01F@users.sourceforge.jp>

===================================================================
RCS file: plugin/sasl/debian/postinst,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin/sasl/debian/postinst	2004/09/23 06:21:18	1.3
+++ plugin/sasl/debian/postinst	2004/09/30 02:56:50	1.4
@@ -19,7 +19,7 @@
 
 case "$1" in
     configure)
-    	/usr/sbin/update-ultrapossum configure
+    	/usr/share/ultrapossum/update.d/update-sasl configure
         if [ -x "/etc/init.d/ultrapossum-server" ]; then
 	  if [ -x /usr/sbin/invoke-rc.d ]; then
 	    invoke-rc.d ultrapossum-server restart


From taru ¡÷ users.sourceforge.jp  Thu Sep 30 12:03:17 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 30 Sep 2004 12:03:17 +0900
Subject: [Ultrapossum-cvs 640] plugin/snmp 1.3,1.4,01snmp
Message-ID: <20040930030317.18D8B2AC01F@users.sourceforge.jp>

===================================================================
RCS file: plugin/snmp/01snmp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin/snmp/01snmp	2004/09/30 02:56:05	1.3
+++ plugin/snmp/01snmp	2004/09/30 03:03:17	1.4
@@ -23,7 +23,7 @@
 # Defining Variables
 if test "x$cache" = "x"; then
   SNMP_COMMUNITY=$(ultrapossum_getconf SNMP_COMMUNITY "$PACKAGE")
-  SNMP_MIB=$(ultrapossum_getconf SNMP_MIB ".1.3.6.1.4.1.14327.2.2.2.1")
+  SNMP_MIB=$(ultrapossum_getconf SNMP_MIB ".1.3.6.1.4.1.14327.2.2.2.1.1")
   SNMPD_CONF_IN=$(ultrapossum_getconf SNMPD_CONF_IN "$TEMPLATEDIR/snmpd.conf.in")
   SNMPD_CONF=$(ultrapossum_getconf SNMPD_CONF "$sysconfdir/snmp/snmpd.conf")
   SNMPPASS=$(ultrapossum_getconf SNMPPASSDIR "$MODULEDIR/snmp/snmppass")


From taru ¡÷ users.sourceforge.jp  Thu Sep 30 16:00:43 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 30 Sep 2004 16:00:43 +0900
Subject: [Ultrapossum-cvs 641] ultrapossum/module/server ...
Message-ID: <20040930070043.4BBED2AC01F@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/server/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ultrapossum/module/server/Makefile.am	2004/09/28 14:22:54	1.13
+++ ultrapossum/module/server/Makefile.am	2004/09/30 07:00:43	1.14
@@ -1,4 +1,3 @@
-
 modulename = server
 
 include ../ultrapossum.am.in
@@ -23,6 +22,12 @@
 	init.ldif.in
 
 install-data-local:
+	$(mkinstalldirs) $(DESTDIR)/$(modulelocaldir)/db/
+	for f in db/dbdump db/dbload db/dbtransition; do\
+		$(INSTALL_SCRIPT) $(srcdir)/$$f \
+			$(DESTDIR)/$(modulelocaldir)/db/; \
+	done
+
 	$(mkinstalldirs) $(DESTDIR)/$(sysconfdir)/$(PACKAGE)/
 	$(mkinstalldirs) $(DESTDIR)/$(sysconfdir)/$(PACKAGE)/in.d/
 	$(mkinstalldirs) $(DESTDIR)/$(sysconfdir)/$(PACKAGE)/init.ldif.d/
@@ -54,5 +59,8 @@
 	backup.sh \
 	apps \
 	fetchldif \
-	pid
+	pid \
+	db/dbdump \
+	db/dbload \
+	db/dbtransition
 
===================================================================
RCS file: ultrapossum/module/server/update-server,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- ultrapossum/module/server/update-server	2004/09/29 12:59:08	1.54
+++ ultrapossum/module/server/update-server	2004/09/30 07:00:43	1.55
@@ -262,6 +262,11 @@
         echo "E: db directory holds another backend type: $val in $DIRECTORY" 1>&2
         exit 1
       fi
+      val=`getvalue $DIRECTORY/ultrapossum-environ SLAPD_BERKLEYDB_SONAME`
+      if test "x$val" != "x$SLAPD_BERKLEYDB_SONAME"; then
+        echo "E: db is using other berkley db: $val in $DIRECTORY" 1>&2
+        exit 1
+      fi
     else
       echo "W: db directory already exists: $DIRECTORY" 1>&2
     fi


From taru ¡÷ users.sourceforge.jp  Thu Sep 30 16:00:43 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 30 Sep 2004 16:00:43 +0900
Subject: [Ultrapossum-cvs 642] ultrapossum/module/server/db ...
Message-ID: <20040930070043.5D9722AC0BB@users.sourceforge.jp>



From taru ¡÷ users.sourceforge.jp  Thu Sep 30 16:56:55 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 30 Sep 2004 16:56:55 +0900
Subject: [Ultrapossum-cvs 643] ultrapossum/module/failover 1.6,1.7,ha.cf.sh
Message-ID: <20040930075655.21FAC2AC01E@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/failover/ha.cf.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ultrapossum/module/failover/ha.cf.sh	2004/09/25 02:56:37	1.6
+++ ultrapossum/module/failover/ha.cf.sh	2004/09/30 07:56:55	1.7
@@ -61,7 +61,7 @@
 do
   val=$(eval "echo \$$d")
   if test "x$val" != "x"; then
-    sed -e "/#$d	/ a\\" -e "$d	$val" < $tmp > $tmp2
+    sed -e "/#$d/a\\" -e "$d	$val" < $tmp > $tmp2
     cp $tmp2 $tmp
   fi
 done


From taru ¡÷ users.sourceforge.jp  Thu Sep 30 17:02:07 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 30 Sep 2004 17:02:07 +0900
Subject: [Ultrapossum-cvs 644] ultrapossum 1.4,1.5,default.cf
Message-ID: <20040930080207.4DCC72AC01E@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/default.cf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ultrapossum/default.cf	2004/09/25 02:56:37	1.4
+++ ultrapossum/default.cf	2004/09/30 08:02:07	1.5
@@ -39,6 +39,7 @@
 #udpport="694"
 #udp="eth0"
 #mcast="eth0 225.0.0.1 694 1 1"
+#ucast="eth0 192.168.1.1"
 #watchdog="/dev/watchdog"
 #nice_failback="off"
 #auto_failback="on"


From taru ¡÷ users.sourceforge.jp  Thu Sep 30 17:02:07 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 30 Sep 2004 17:02:07 +0900
Subject: [Ultrapossum-cvs 645] ultrapossum/module/failover 1.2, 1.3,
	ha.cf.in 1.7, 1.8, ha.cf.sh
Message-ID: <20040930080207.6A7242AC0C3@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/failover/ha.cf.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ultrapossum/module/failover/ha.cf.in	2004/09/28 14:22:53	1.2
+++ ultrapossum/module/failover/ha.cf.in	2004/09/30 08:02:07	1.3
@@ -84,16 +84,16 @@
 #baud	19200
 #	
 #	serial	serialportname ...
-#serial	/dev/ttyS0	# Linux
-#serial	/dev/cuaa0	# FreeBSD
+##serial	/dev/ttyS0	# Linux
+##serial	/dev/cuaa0	# FreeBSD
 #serial	/dev/cua/a	# Solaris
 #
 #
 #	What interfaces to broadcast heartbeats over?
 #
-#bcast	eth0		# Linux
-#bcast	eth1 eth2	# Linux
-#bcast	le0		# Solaris
+##bcast	eth0		# Linux
+##bcast	eth1 eth2	# Linux
+##bcast	le0		# Solaris
 #bcast	le1 le2		# Solaris
 #
 #	Set up a multicast heartbeat medium
@@ -195,8 +195,8 @@
 #	and their detailed configuration options, run this command:
 #		stonith -h
 #
-#stonith_host *     baytech 10.0.0.3 mylogin mysecretpassword
-#stonith_host ken3  rps10 /dev/ttyS1 kathy 0 
+##stonith_host *     baytech 10.0.0.3 mylogin mysecretpassword
+##stonith_host ken3  rps10 /dev/ttyS1 kathy 0 
 #stonith_host kathy rps10 /dev/ttyS1 ken3 0 
 #
 #	Watchdog is the watchdog timer.  If our own heart doesn't beat for
@@ -231,13 +231,13 @@
 #	Processes started and stopped with heartbeat.  Restarted unless
 #		they exit with rc=100
 #
-#respawn userid /path/name/to/run
+##respawn userid /path/name/to/run
 #respawn hacluster /usr/lib/heartbeat/ipfail
 #
 #	Access control for client api
 #       	default is no access
 #
-#apiauth client-name gid=gidlist uid=uidlist
+##apiauth client-name gid=gidlist uid=uidlist
 #apiauth ipfail gid=haclient uid=hacluster
 
 ###########################
@@ -275,13 +275,12 @@
 #	this will be used for authorizing groupless clients, and any client groups
 #	not otherwise specified.
 #
-#apiauth	ipfail uid=hacluster
-#apiauth ccm uid=hacluster
-#apiauth ping gid=haclient uid=alanr,root
+##apiauth	ipfail uid=hacluster
+##apiauth ccm uid=hacluster
+##apiauth ping gid=haclient uid=alanr,root
 #apiauth default gid=haclient
 
 # message format in the wire, it can be classic or netstring, default is classic
 #msgfmt  netstring
-
 
 
===================================================================
RCS file: ultrapossum/module/failover/ha.cf.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ultrapossum/module/failover/ha.cf.sh	2004/09/30 07:56:55	1.7
+++ ultrapossum/module/failover/ha.cf.sh	2004/09/30 08:02:07	1.8
@@ -34,6 +34,7 @@
 #udpport="694"
 #udp="eth0"
 #mcast="eth0 225.0.0.1 694 1 1"
+#ucast="eth0 192.168.1.1"
 #watchdog="/dev/watchdog"
 #nice_failback="off"
 #auto_failback="on"
@@ -46,7 +47,7 @@
   source_shell default.cf
 fi
 
-SUPPORTED_DIRECTIVE="debugfile logfile logfacility keepalive deadtime initdead hopfudge serial baud udpport udp mcast watchdog nice_failback auto_failback"
+SUPPORTED_DIRECTIVE="debugfile logfile logfacility keepalive deadtime initdead hopfudge serial baud udpport udp mcast ucast watchdog nice_failback auto_failback"
 HACFIN=$TEMPLATEDIR/ha.cf.in
 if test -f "ha.cf.in"; then
   HACFIN=ha.cf.in


From taru ¡÷ users.sourceforge.jp  Thu Sep 30 17:05:10 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 30 Sep 2004 17:05:10 +0900
Subject: [Ultrapossum-cvs 646] ultrapossum/module/failover 1.8,1.9,ha.cf.sh
Message-ID: <20040930080510.7E6C62AC01E@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/failover/ha.cf.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ultrapossum/module/failover/ha.cf.sh	2004/09/30 08:02:07	1.8
+++ ultrapossum/module/failover/ha.cf.sh	2004/09/30 08:05:10	1.9
@@ -62,7 +62,7 @@
 do
   val=$(eval "echo \$$d")
   if test "x$val" != "x"; then
-    sed -e "/#$d/a\\" -e "$d	$val" < $tmp > $tmp2
+    sed -e "/^#$d/a\\" -e "$d	$val" < $tmp > $tmp2
     cp $tmp2 $tmp
   fi
 done


From taru ¡÷ users.sourceforge.jp  Thu Sep 30 17:26:01 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 30 Sep 2004 17:26:01 +0900
Subject: [Ultrapossum-cvs 647] ultrapossum/debian 1.64,1.65,changelog
Message-ID: <20040930082601.1D5572AC01E@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/changelog,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- ultrapossum/debian/changelog	2004/09/29 11:57:02	1.64
+++ ultrapossum/debian/changelog	2004/09/30 08:26:01	1.65
@@ -1,3 +1,9 @@
+ultrapossum (0.1beta12-0pre2) unstable; urgency=low
+
+  * Applied the latest upstream version.
+
+ -- Masato Taruishi <taru ¡÷ valinux.co.jp>  Thu, 30 Sep 2004 17:24:10 +0900
+
 ultrapossum (0.1beta12-0pre1) unstable; urgency=low
 
   * New upstream release.


From taru ¡÷ users.sourceforge.jp  Thu Sep 30 18:33:35 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 30 Sep 2004 18:33:35 +0900
Subject: [Ultrapossum-cvs 648] ultrapossum/module/server 1.6, 1.7,
	slapd-bdb.conf.in
Message-ID: <20040930093335.EF8B32AC08F@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/server/slapd-bdb.conf.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ultrapossum/module/server/slapd-bdb.conf.in	2004/09/23 06:28:04	1.6
+++ ultrapossum/module/server/slapd-bdb.conf.in	2004/09/30 09:33:35	1.7
@@ -24,6 +24,18 @@
 # Save the time that the entry gets modified
 lastmod on
 
+# Sample security access control:
+#
+# 	localhost: allow
+#       other hosts: needs secure connection
+#
+#    control 'break' enables any others access controls.
+# 
+# access to *
+#	by ssf=56 none break
+#	by peername.regex=127.0.0.1 none break
+#	by * none
+
 # The userPassword by default can be changed
 # by the entry owning it if they are authenticated.
 # Others should not be able to see it, except the


From taru ¡÷ users.sourceforge.jp  Thu Sep 30 18:37:25 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 30 Sep 2004 18:37:25 +0900
Subject: [Ultrapossum-cvs 649] ultrapossum/module/server 1.25, 1.26,
	createdb.sh
Message-ID: <20040930093725.5F1942AC08F@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/module/server/createdb.sh,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ultrapossum/module/server/createdb.sh	2004/09/27 16:27:45	1.25
+++ ultrapossum/module/server/createdb.sh	2004/09/30 09:37:25	1.26
@@ -98,7 +98,7 @@
  if test -f "$INITLDIF" && head -n 100 "$INITLDIF" | egrep "^dn: " > /dev/null; then
    extraldifs="$extraldifs $INITLDIF"
  fi
- extraldifs="$extraldifs `find $INITLDIFDIR -type f -maxdepth 1 | sort | tr '\n' ' '`"
+ extraldifs="$extraldifs `find $INITLDIFDIR -type f | sort | tr '\n' ' '`"
 else
  ldiffile=$DIRECTORY/$HOST.ldif
  if ! test -s $ldiffile; then


From taru ¡÷ users.sourceforge.jp  Thu Sep 30 18:38:51 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 30 Sep 2004 18:38:51 +0900
Subject: [Ultrapossum-cvs 650] ultrapossum 1.5,1.6,ultrapossum-server.in
Message-ID: <20040930093851.8C06A2AC08F@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/ultrapossum-server.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ultrapossum/ultrapossum-server.in	2004/09/27 11:51:48	1.5
+++ ultrapossum/ultrapossum-server.in	2004/09/30 09:38:51	1.6
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@


From taru ¡÷ users.sourceforge.jp  Thu Sep 30 18:49:26 2004
From: taru ¡÷ users.sourceforge.jp (Masato Taruishi)
Date: Thu, 30 Sep 2004 18:49:26 +0900
Subject: [Ultrapossum-cvs 651] ultrapossum/debian 1.6, 1.7,
	ultrapossum-tls.config
Message-ID: <20040930094926.E241C2AC08F@users.sourceforge.jp>

===================================================================
RCS file: ultrapossum/debian/ultrapossum-tls.config,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ultrapossum/debian/ultrapossum-tls.config	2004/09/24 17:07:03	1.6
+++ ultrapossum/debian/ultrapossum-tls.config	2004/09/30 09:49:26	1.7
@@ -39,11 +39,11 @@
   }
 else
   if test -f "$TLSCERTIFICATEFILE"; then
-    echo "Certificate file already exist; $TLSCERTIFICATEFILE" 1>&2
+#    echo "Certificate file already exist: $TLSCERTIFICATEFILE" 1>&2
     exit 0
   fi
   if test -f "$TLSCERTIFICATEKEYFILE"; then
-    echo "Certificate key file already exist; $TLSCERTIFICATEKEYFILE" 1>&2
+#    echo "Certificate key file already exist: $TLSCERTIFICATEKEYFILE" 1>&2
     exit 0
   fi
   set() {