[Sandweb-commit] CVS: sandweb/lib/SandWeb/Auth FlatFile.pm,1.2,1.3

[Nick J. <nje...@us...>]

Update of /cvsroot/sandweb/sandweb/lib/SandWeb/Auth
In directory usw-pr-cvs1:/tmp/cvs-serv5544/lib/SandWeb/Auth

Modified Files:
	FlatFile.pm 
Log Message:
Fixed little problem with authentication (newline character needed to be chomped)


Index: FlatFile.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Auth/FlatFile.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- FlatFile.pm	2001/10/06 07:51:56	1.2
+++ FlatFile.pm	2001/10/07 14:16:57	1.3
@@ -2,11 +2,11 @@
 
 sub new {
-    my $class = shift;
-    my %args = @_;
+	my $class = shift;
+	my %args = @_;
  
-    my $self = bless {
-       'user_info' => {},
-       '_log_obj' => $args{'log_obj'},
-    }, $class;
+	my $self = bless {
+		'user_info' => {},
+		'_log_obj' => $args{'log_obj'},
+	}, $class;
  
     return $self;
@@ -14,30 +14,31 @@
 
 sub verify_password {
-    my $self = shift;
-    my $username = shift;
-    my $password = shift;
-    my $data_dir = shift;
-    my $log = $self->_logobj();
-    open (PF, "< $data_dir/passwd") or
-        $log->debug("Could not open password file : $! \n");
-    while (<PF>) {
-        my $passwd_file = $_;
-        my ($real_username, $uid, $real_password) = split(':', $passwd_file);
-	if ($username eq $real_username) {
-            my $salt = substr($real_password, 0, 2);
-            if (crypt($password, $salt) ne $real_password) {
-                close PF;
-                return 0;
-            } else {
-                close PF;
-                return 1;
-            }
-        }
-    }
+	my $self = shift;
+	my $username = shift;
+	my $password = shift;
+	my $data_dir = shift;
+	my $log = $self->_logobj();
+	open (PF, "< $data_dir/passwd") or
+		$log->debug("Could not open password file : $! \n");
+	while (<PF>) {
+		my $passwd_file = $_;
+		my ($real_username, $uid, $real_password) = split(':', $passwd_file);
+		if ($username eq $real_username) {
+			my $salt = substr($real_password, 0, 2);
+			chomp($real_password);
+			if (crypt($password, $salt) ne $real_password) {
+				close PF;
+				return 0;
+			} else {
+				close PF;
+				return 1;
+			}
+		}
+	}
 }
 
 sub _logobj {
-    my $self = shift;
-    return $self->{'_log_obj'};
+	my $self = shift;
+	return $self->{'_log_obj'};
 }