X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FUID.pm;h=3e71f09f1eae7673376a6adf89430128171d4ad8;hb=8c1f9804d9a02c0c054eededeb500c72a640249a;hp=88d7338290fa59c732566aa26cf00b867b75e348;hpb=b4a403644cb80a612dd028882f971bdd20839275;p=freeside.git

diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index 88d733829..3e71f09f1 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -4,6 +4,7 @@ use strict;
 use vars qw(
   @ISA @EXPORT_OK $cgi $dbh $freeside_uid $user 
   $conf_dir $secrets $datasrc $db_user $db_pass %callback $driver_name
+  $AutoCommit
 );
 use subs qw(
   getsecrets cgisetotaker
@@ -14,13 +15,15 @@ use DBI;
 use FS::Conf;
 
 @ISA = qw(Exporter);
-@EXPORT_OK = qw(checkeuid checkruid swapuid cgisuidsetup
+@EXPORT_OK = qw(checkeuid checkruid cgisuidsetup
                 adminsuidsetup getotaker dbh datasrc getsecrets driver_name );
 
 $freeside_uid = scalar(getpwnam('freeside'));
 
 $conf_dir = "/usr/local/etc/freeside/";
 
+$AutoCommit = 1; #ours, not DBI
+
 =head1 NAME
 
 FS::UID - Subroutines for database login and assorted other stuff
@@ -28,7 +31,7 @@ FS::UID - Subroutines for database login and assorted other stuff
 =head1 SYNOPSIS
 
   use FS::UID qw(adminsuidsetup cgisuidsetup dbh datasrc getotaker
-  checkeuid checkruid swapuid);
+  checkeuid checkruid);
 
   adminsuidsetup $user;
 
@@ -75,13 +78,12 @@ sub adminsuidsetup {
 
   croak "Not running uid freeside!" unless checkeuid();
   getsecrets;
+  $dbh->disconnect if $dbh;
   $dbh = DBI->connect($datasrc,$db_user,$db_pass, {
-                          'AutoCommit' => 'true',
-                          'ChopBlanks' => 'true',
+                          'AutoCommit' => 0,
+                          'ChopBlanks' => 1,
   } ) or die "DBI->connect error: $DBI::errstr\n";
 
-  swapuid(); #go to non-privledged user if running setuid freeside
-
   foreach ( keys %callback ) {
     &{$callback{$_}};
   }
@@ -182,7 +184,8 @@ sub cgisetotaker {
   } elsif ( $cgi && $cgi->isa('Apache') ) {
     $user = lc ( $cgi->connection->user );
   } else {
-    die "fatal: Can't get REMOTE_USER! for cgi $cgi";
+    die "fatal: Can't get REMOTE_USER! for cgi $cgi - you need to setup ".
+        "Apache user authentication as documented in htdocs/docs/config.html";
   }
   $user;
 }
@@ -207,16 +210,6 @@ sub checkruid {
   ( $< == $freeside_uid );
 }
 
-=item swapuid
-
-Swaps real and effective UIDs.
-
-=cut
-
-sub swapuid {
-  ($<,$>) = ($>,$<) if $< != $>;
-}
-
 =item getsecrets [ USER ]
 
 Sets the user to USER, if supplied.
@@ -256,7 +249,7 @@ coderef into the hash %FS::UID::callback :
 
 =head1 VERSION
 
-$Id: UID.pm,v 1.3 2000-06-23 12:25:59 ivan Exp $
+$Id: UID.pm,v 1.8 2001-08-21 09:34:13 ivan Exp $
 
 =head1 BUGS