From 74d59a7146046e54da2b37435cca8937b66093cd Mon Sep 17 00:00:00 2001
From: Mark Wells <mark@freeside.biz>
Date: Fri, 12 Jun 2015 17:31:29 -0700
Subject: fix autocommit in part_pkg_link->insert/delete, #36784

---
 FS/FS/part_pkg_link.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FS/FS/part_pkg_link.pm b/FS/FS/part_pkg_link.pm
index 8e43d155e..ce071ef17 100644
--- a/FS/FS/part_pkg_link.pm
+++ b/FS/FS/part_pkg_link.pm
@@ -130,6 +130,7 @@ sub insert {
     return $error if $error;
   }
 
+  $dbh->commit if $oldAutoCommit;
   return;
 }
 
@@ -166,7 +167,7 @@ sub delete {
     $dbh->rollback if $oldAutoCommit;
     return $error;
   }
-  $dbh->commit;
+  $dbh->commit if $oldAutoCommit;
   return;
 }
 
-- 
cgit v1.2.1


From 75f57b8c71dbb3b48ebf9ccdc9f33866613452f3 Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Sat, 13 Jun 2015 15:19:18 -0700
Subject: freeside-adduser encrypts passwords too, RT#21563

---
 FS/bin/freeside-adduser | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FS/bin/freeside-adduser b/FS/bin/freeside-adduser
index 2f4e22cbf..6b4becb5f 100644
--- a/FS/bin/freeside-adduser
+++ b/FS/bin/freeside-adduser
@@ -22,10 +22,10 @@ adminsuidsetup $user;
 
 my $access_user = new FS::access_user {
   'username'  => $user,
-  '_password' => $password,
   'first'     => 'Firstname', # $opt_f || 
   'last'      => 'Lastname',  # $opt_l || 
 };
+$access_user->change_password_fields($password) if length($password);
 my $au_error = $access_user->insert;
 die $au_error if $au_error;
 
-- 
cgit v1.2.1