ispman/bin ispman.denyFTP, 1.4, 1.4.6.1 ispman.passwd.user, 1.3, 1.3.6.1

Update of /cvsroot/ispman/ispman/bin
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv23721/bin

Modified Files:
      Tag: dev_1_3-cyrus_virtdomain
	ispman.denyFTP ispman.passwd.user 
Log Message:
At first glance all 's/\./_/g' replacements are handled correctly for AllowFullEmailLogins.


Index: ispman.denyFTP
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.denyFTP,v
retrieving revision 1.4
retrieving revision 1.4.6.1
diff -u -d -r1.4 -r1.4.6.1
--- ispman.denyFTP	30 May 2004 23:35:31 -0000	1.4
+++ ispman.denyFTP	2 Oct 2006 09:23:16 -0000	1.4.6.1
@@ -54,8 +54,12 @@
 
 sub getUserDN {
     my ( $user, $domain ) = @_;
-    $uid = join( '_', ( $user, $domain ) );
-    $uid =~ s/\./_/g;
+    if ( $ISPMan::Config->{'AllowFullEmailLogins'} ) {
+         $uid = join( '@', ( $user, $domain ) );
+     } else {
+         $uid = join( '_', ( $user, $domain ) );
+         $uid =~ s/\./_/g;
+     }
     return join ',',
       (
         "uid=$uid", "ou=users", "ispmanDomain=$domain",

Index: ispman.passwd.user
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.passwd.user,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -u -d -r1.3 -r1.3.6.1
--- ispman.passwd.user	30 May 2004 23:35:32 -0000	1.3
+++ ispman.passwd.user	2 Oct 2006 09:23:16 -0000	1.3.6.1
@@ -21,8 +21,12 @@
 use ISPMan;
 my $ispman = ISPMan->new();
 my ( $ispmanUserId, $domain ) = split( '@', $ARGV[0] );
-my $uid = join( '_', ( $ispmanUserId, $domain ) );
-$uid =~ s/\./_/g;
+if ( $ISPMan::Config->{'AllowFullEmailLogins'} ) {
+    my $uid = $ARGV[0];
+} else {
+    my $uid = join( '_', ( $ispmanUserId, $domain ) );
+    $uid =~ s/\./_/g;
+}
 $ispman->changePassword( $uid, $domain, $ARGV[1],
     $ispman->getConf('userPassHashMethod') );
 __END__


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV