ispman/lib/ISPMan UserMan.pm,1.42,1.43

Update of /cvsroot/ispman/ispman/lib/ISPMan
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16950/lib/ISPMan

Modified Files:
	UserMan.pm 
Log Message:
merged fix from rel_1_1-bugfixes (up to 1.35.2.5)

Index: UserMan.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/ISPMan/UserMan.pm,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- UserMan.pm	17 Apr 2004 09:54:57 -0000	1.42
+++ UserMan.pm	17 Apr 2004 15:13:00 -0000	1.43
@@ -118,10 +118,10 @@
    my $self=shift;
    my $r=shift;
 
-   
+   # filter supplied uid 
    my $userid=$r->param("uid");
    $userid=lc($userid);
-   $userid=~s/[^a-z0-9\-_]//g;
+   $userid=~s/[^a-z0-9\-_\.]//g;
    $r->param("userid", $userid);
 
    # lets  crypt the pass
@@ -141,7 +141,8 @@
    }
    
 
-   my $_uid=$self->create_uid($r->param("uid"), $r->param("ispmanDomain"));
+   # build unique uid from userid and domain
+   my $_uid=$self->create_uid($r->param("userid"), $r->param("ispmanDomain"));
    $r->param("uid", $_uid);
    
    my $dn="uid=$_uid, ou=users, ispmanDomain=$domain, " . $self->{'Config'}{'ldapBaseDN'};
@@ -549,6 +550,8 @@
    
 
    $domain=~  s/\./_/g;
+   $userId=~  s/\./_/g;
+   
    unless ($userId=~ /$domain$/){
       $userId=join "_", ($userId, $domain);
    }



-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click