[Commits] idmgr branch xs-0.6 updated.

[Martin Langhoff]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "/home/olpc-code/git/projects/idmgr".

The branch, xs-0.6 has been updated
       via  4f7e5a230b4d54f402d341ef00890d8ad02f7f96 (commit)
       via  a8d7d9417db11d6186a43628c5c18512af647c6c (commit)
      from  bc52a5a25df28ef8eb034a2ab766daa72af2e889 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

 Makefile            |   12 ++++++------
 scripts/create_user |    3 +++
 2 files changed, 9 insertions(+), 6 deletions(-)

- Log -----------------------------------------------------------------
commit 4f7e5a230b4d54f402d341ef00890d8ad02f7f96
Author: Martin Langhoff <martin at laptop.org>
Date:   Fri Oct 8 16:09:24 2010 -0400

    Makefile -- fixups for the xs-0.6 branch

diff --git a/Makefile b/Makefile
index 5175ef1..484596c 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ PYTHON_SITELIB = /usr/lib/python$(PY_VERSION)/site-packages
 # NOTE: Release is hardcoded in the spec file to 1
 NV = $(PKGNAME)-$(VERSION)
 NVR = $(NV)-$(RELEASE)
-DISTVER=xs11
+DISTVER=xs9
 
 # rpm target directory
 BUILDDIR = $(PWD)/build
@@ -71,13 +71,13 @@ $(RPM): SRPM
 
 publish: SOURCES SRPM
 	rsync -e ssh --progress  $(RPM) \
-	    xs-dev.laptop.org:/xsrepos/testing/olpc/11/i386/
+	    xs-dev.laptop.org:/xsrepos/testing/olpc/9/i386/
 	rsync -e ssh --progress $(SRPM) \
-	    xs-dev.laptop.org:/xsrepos/testing/olpc/11/source/SRPMS/
+	    xs-dev.laptop.org:/xsrepos/testing/olpc/9/source/SRPMS/
 	rsync -e ssh --progress $(TARBALL) \
-	    xs-dev.laptop.org:/xsrepos/testing/olpc/11/source/SOURCES/
-	ssh xs-dev.laptop.org sudo createrepo /xsrepos/testing/olpc/11/i386
-	ssh xs-dev.laptop.org sudo createrepo /xsrepos/testing/olpc/11/source/SRPMS
+	    xs-dev.laptop.org:/xsrepos/testing/olpc/9/source/SOURCES/
+	ssh xs-dev.laptop.org sudo createrepo /xsrepos/testing/olpc/9/i386
+	ssh xs-dev.laptop.org sudo createrepo /xsrepos/testing/olpc/9/source/SRPMS
 
 install:
 	install -D -d $(DESTDIR)/home/idmgr

commit a8d7d9417db11d6186a43628c5c18512af647c6c
Author: Martin Langhoff <martin at laptop.org>
Date:   Fri Oct 8 15:58:33 2010 -0400

    Fix registration failure when user nickname contains ':' SL#2152
    
    we were not filtering the content of the GECOS field. Turns out
    useradd/usermod disallow ':' because it's the passwd field separator.
    
    So clear it out, rather than failing.  "Little Bobby Smiley :-)" isn't trying
    to exploit XS.
    
    (Escape handling is otherwise sane -- my "`touch /tmp/powned`" users
    all registered safely.)

diff --git a/scripts/create_user b/scripts/create_user
index 96cd522..bc4c7f6 100755
--- a/scripts/create_user
+++ b/scripts/create_user
@@ -57,6 +57,9 @@ echo "$username" | grep -s -E '^[A-Z]{3}[A-F0-9]{8}$' &> /dev/null || die "bad u
 if [ "$PASSWD_ONLY" == '0' ]; then
 	echo "$pubkey" | grep -s -E '^[A-Za-z0-9+/=]+$' &> /dev/null || die "bad public key"
 fi
+# cleanup gecos -- useradd/usermod only block ':' from
+# gecos field
+full_name=`echo "$full_name" | sed 's/://g'`
 
 homedir=/library/users/$username
 XO_USERS_GROUP=xousers
-----------------------------------------------------------------------


--
/home/olpc-code/git/projects/idmgr