From 1e5841b231ffd22085c6501748b22cd9687a7f05 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Aug 2010 06:43:07 +0000
Subject: LEAVE is reserved in msyql

---
 FS/FS/Schema.pm     | 2 +-
 FS/FS/acct_snarf.pm | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 8772a3dbf..dfd7a8789 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -2012,7 +2012,7 @@ sub tables_hashref {
         'username',   'varchar',     '', $char_d, '', '', 
         '_password',  'varchar',     '', $char_d, '', '', 
         'check_freq',     'int', 'NULL',      '', '', '', 
-        'leave',         'char', 'NULL',       1, '', '', 
+        'leavemail',     'char', 'NULL',       1, '', '', 
         'apop',          'char', 'NULL',       1, '', '', 
         'tls',           'char', 'NULL',       1, '', '', 
         'mailbox',    'varchar', 'NULL', $char_d, '', '', 
diff --git a/FS/FS/acct_snarf.pm b/FS/FS/acct_snarf.pm
index 480a632bb..9816de965 100644
--- a/FS/FS/acct_snarf.pm
+++ b/FS/FS/acct_snarf.pm
@@ -142,7 +142,7 @@ sub check {
     || $self->ut_alphan('protocol')
     || $self->ut_textn('username')
     || $self->ut_numbern('check_freq')
-    || $self->ut_enum('leave', [ '', 'Y' ])
+    || $self->ut_enum('leavemail', [ '', 'Y' ])
     || $self->ut_enum('apop', [ '', 'Y' ])
     || $self->ut_enum('tls', [ '', 'Y' ])
     || $self->ut_alphan('mailbox')
@@ -195,9 +195,9 @@ sub cgp_hashref {
     'domain'   => $self->machine,
     'password' => $self->_password,
     'period'   => $self->check_freq.'s',
-    'APOP'     => ( $self->apop  eq 'Y' ? 'YES' : 'NO' ),
-    'TLS'      => ( $self->tls   eq 'Y' ? 'YES' : 'NO' ),
-    'Leave'    => ( $self->leave eq 'Y' ? 'YES' : 'NO' ), #XXX leave??
+    'APOP'     => ( $self->apop      eq 'Y' ? 'YES' : 'NO' ),
+    'TLS'      => ( $self->tls       eq 'Y' ? 'YES' : 'NO' ),
+    'Leave'    => ( $self->leavemail eq 'Y' ? 'YES' : 'NO' ), #XXX leave??
   };
 }
 
-- 
cgit v1.2.1