ispman/lib/ISPMan UserMan.pm,1.35.2.4,1.35.2.5

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

Modified Files:
      Tag: rel_1_1-bugfixes
	UserMan.pm 
Log Message:
previous fix was imcomplete
this should finaly fix it now

Index: UserMan.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/ISPMan/UserMan.pm,v
retrieving revision 1.35.2.4
retrieving revision 1.35.2.5
diff -u -d -r1.35.2.4 -r1.35.2.5
--- UserMan.pm	17 Apr 2004 13:12:45 -0000	1.35.2.4
+++ UserMan.pm	17 Apr 2004 14:42:03 -0000	1.35.2.5
@@ -118,11 +118,11 @@
    my $self=shift;
    my $r=shift;
 
-   
+   # filter supplied uid
    my $userid=$r->param("uid");
    $userid=lc($userid);
-   $userid=~s/[^a-z0-9\-_]//g;
-   $r->param("uid", $userid);
+   $userid=~s/[^a-z0-9\-_\.]//g;
+   $r->param("userid", $userid);
 
    # lets  crypt the pass
    my $userpassword=$self->encryptPassWithMethod($r->param("userPassword"),$self->getConf('userPassHashMethod'));
@@ -131,7 +131,8 @@
    
    my $domain=$r->param("ispmanDomain");
 
-   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'};
@@ -145,9 +146,9 @@
 
    my $domain_info=$self->getDomainInfo($r->param("ispmanDomain"));
    my $homeDirectory=join '/', ($domain_info->{'homeDirectory'}, "users", $r->param("uid"), "");
-   my $cn=($r->param("givenName") && $r->param("sn"))? join " ", ($r->param("givenName"), $r->param("sn")) :$r->param("uid");
+   my $cn=($r->param("givenName") && $r->param("sn"))? join " ", ($r->param("givenName"), $r->param("sn")) :$r->param("userid");
    $r->param("cn", $cn);
-   $r->param("sn", ($r->param("sn")? $r->param("sn"):$r->param("uid")));
+   $r->param("sn", ($r->param("sn")? $r->param("sn"):$r->param("userid")));
    $r->param("homeDirectory", $homeDirectory);
 
    #define 1 MB quota by default
@@ -527,6 +528,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