[Da-tools-commits] ./da-tools/userdir-ldap-common r379: merge from -debian branch
Mark Hymers
mhy at debian.org
Thu Jan 10 15:12:13 UTC 2008
------------------------------------------------------------
revno: 379
committer: Mark Hymers <mhy at debian.org>
branch nick: userdir-ldap-common
timestamp: Thu 2008-01-10 15:12:13 +0000
message:
merge from -debian branch
modified:
debian/changelog
debian/install
ud-replicate
------------------------------------------------------------
revno: 349.4.13
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Thu 2008-01-10 10:05:11 +0100
message:
Merge from alioth: note about more modern slapd configs
modified:
doc/slapd-config.txt
------------------------------------------------------------
revno: 349.4.14
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Thu 2008-01-10 14:10:58 +0100
message:
Merge from alioth
merge r356 from alioth's userdir-ldap-common, and cherry pick that fix onto that:
committer: Mark Hymers <mhy at debian.org>
branch nick: userdir-ldap-common
timestamp: Thu 2008-01-10 12:58:39 +0000
message:
Fix mistake in ud-userimport add logic spotted by Peter Palfrader.
modified:
debian/changelog
ud-groupadd
ud-roleadd
ud-useradd
ud-userimport
userdir_ldap.py
------------------------------------------------------------
revno: 349.4.15
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Thu 2008-01-10 14:13:31 +0100
message:
merge from alioth
modified:
debian/changelog
ud-useradd
------------------------------------------------------------
revno: 349.4.16
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Thu 2008-01-10 14:50:25 +0100
message:
Merge from alioth
Replace deprecated string.$foo($bar, $ARGS) calls with $bar.$foo($ARGS).
Also cherry pick two fixes on the patch from later in that tree:
revno: 375
committer: Mark Hymers <mhy at debian.org>
branch nick: userdir-ldap-common
timestamp: Thu 2008-01-10 13:44:07 +0000
message:
Don't convert strings to integers, just check that they could be converted.
Noticed by Peter (again)
--
revno: 376
committer: Mark Hymers <mhy at debian.org>
branch nick: userdir-ldap-common
timestamp: Thu 2008-01-10 13:48:43 +0000
message:
and some more old CheckNumber fixes
modified:
debian/changelog
gpgwrapper
sigcheck
ud-arbimport
ud-echelon
ud-emailmatcher
ud-forwardlist
ud-generate
ud-gpgimport
ud-gpgsigfetch
ud-groupadd
ud-homecheck
ud-host
ud-info
ud-ldapshow
ud-mailgate
ud-passchk
ud-roleadd
ud-sshlist
ud-useradd
ud-userimport
ud-xearth
userdir_gpg.py
userdir_ldap.py
------------------------------------------------------------
revno: 349.4.17
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Thu 2008-01-10 14:50:58 +0100
message:
Merge from alioth
modified:
debian/changelog
ud-arbimport
------------------------------------------------------------
revno: 349.4.18
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Thu 2008-01-10 15:33:29 +0100
message:
Merge from alioth
modified:
debian/changelog
ud-generate
------------------------------------------------------------
revno: 349.4.19
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Thu 2008-01-10 15:33:50 +0100
message:
A nop with something behind it.
Merge in r361 from alioth-common, the shiftUID patch, but also
cherry pick r377 which reverts it (because it's incomplete/broken).
This is necesary because bzr tracks what you merged so far and
would always want to pull in 361 if I just skipped it now.
------------------------------------------------------------
revno: 349.4.20
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Thu 2008-01-10 15:35:18 +0100
message:
Merge from alioth
added:
ud-config
modified:
debian/changelog
------------------------------------------------------------
revno: 349.4.21
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Thu 2008-01-10 15:43:33 +0100
message:
Merge from alioth
But fix ud-replicate to use `$LOCALSYNCON' instead of `*$LOCALSYNCON*' in the case statement.
modified:
debian/changelog
ud-replicate
userdir-ldap.conf
------------------------------------------------------------
revno: 349.4.22
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Thu 2008-01-10 15:47:02 +0100
message:
Merge from alioth
Copyright statement from people doing stuff on alioth, and pointer to the alioth repository and discussion list
modified:
debian/copyright
------------------------------------------------------------
revno: 349.4.23
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Thu 2008-01-10 15:53:20 +0100
message:
Remerge merge or whatever
------------------------------------------------------------
revno: 349.4.24
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Thu 2008-01-10 15:53:52 +0100
message:
Merge from alioth
modified:
debian/changelog
debian/copyright
------------------------------------------------------------
revno: 349.4.25
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Thu 2008-01-10 15:55:31 +0100
message:
Merge changelog cleanup from alioth, and re-cleanup
modified:
debian/changelog
------------------------------------------------------------
revno: 349.4.26
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Thu 2008-01-10 15:56:17 +0100
message:
Merge from alioth
modified:
debian/changelog
templates/change-reply
templates/error-reply
templates/passwd-changed
templates/ping-reply
templates/welcome-message
templates/welcome-message-60000
templates/welcome-message-800
------------------------------------------------------------
revno: 349.4.27
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Thu 2008-01-10 16:03:07 +0100
message:
Merge packaging cleanup from alioth (including template dir install location fix)
added:
debian/dirs
debian/docs
debian/install
debian/manpages
generate.conf
userdir_ldap.pth
renamed:
doc/makefile => doc/Makefile
modified:
debian/changelog
debian/control
debian/copyright
debian/rules
doc/Makefile
------------------------------------------------------------
revno: 349.4.28
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Thu 2008-01-10 16:03:47 +0100
message:
Nop merge - stuff that was previously included by cherry picking
------------------------------------------------------------
revno: 349.4.29
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Thu 2008-01-10 16:07:10 +0100
message:
Merge from alioth
modified:
debian/install
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog 2008-01-07 01:51:34 +0000
+++ b/debian/changelog 2008-01-10 15:03:07 +0000
@@ -24,6 +24,8 @@
* ud-generate: Set shadow expiry to 1 for locked accounts.
* update doc/slapd-config.txt: labeledURL was removed from the schema but
not the slapd.conf example. Do that now.
+ * add simple ud-config script for use in shell scripts. This allows
+ querying config values.
[ Marc 'HE' Brockschmidt ]
* Make the host ud-replicate syncs from configurable in userdir-ldap.conf,
@@ -36,6 +38,10 @@
debianServer schema and teach ud-host about it
* ud-host: cleanup: Replace local copy HBaseDn of the centrally
configured HostBaseDn.
+ * ud-generate: Mark that no passwords are exported also in the
+ generated passwd file, not only in the shadow file (by using a "*"
+ as password (meaning "no password"), instead of "x" (meaning "do I
+ look like a passwd from the nineties? Look into /etc/shadow!")).
[ Joerg Jaspert ]
* Enhance copyright file a bit, also adding a pointer to our repository
=== modified file 'debian/install'
--- a/debian/install 2008-01-10 14:45:48 +0000
+++ b/debian/install 2008-01-10 15:07:10 +0000
@@ -22,5 +22,5 @@
sigcheck usr/bin
userdir-ldap.conf etc/userdir-ldap/
generate.conf etc/userdir-ldap/
-templates/ etc/userdir-ldap/templates/
+templates/ etc/userdir-ldap/
userdir-ldap.schema etc/ldap/schema/
=== modified file 'ud-replicate'
--- a/ud-replicate 2007-12-27 16:17:13 +0000
+++ b/ud-replicate 2008-01-10 14:43:33 +0000
@@ -39,7 +39,7 @@
trap "rm -f lock" exit
case $HOST in
-*$LOCALSYNCON*)
+$LOCALSYNCON)
udhost=
;;
*)
More information about the Da-tools-commits
mailing list