r23792: convert Samba4 to GPLv3

[kai/samba-autobuild/.git] / source4 / lib / samba3 / samba3.h

diff --git a/source4/lib/samba3/samba3.h b/source4/lib/samba3/samba3.h
index b8a9c68617dccb6be48fd29cbb0ace4f503689dc..bc73e8941dab0e3c976975ff25d1e10d2eb16b67 100644 (file)
--- a/source4/lib/samba3/samba3.h
+++ b/source4/lib/samba3/samba3.h
@@ -5,7 +5,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _SAMBA3_H /* _SAMBA3_H */
@@ -23,6 +22,7 @@
 
 #include "librpc/gen_ndr/security.h"
 #include "librpc/gen_ndr/samr.h"
+#include "param/param.h"
 
 struct samba3_samaccount {
        uint32_t logon_time,
@@ -44,7 +44,6 @@ struct samba3_samaccount {
        char *profile_path;
        char *acct_desc;
        char *workstations;
-       uid_t uid;
        uint32_t user_rid, group_rid, hours_len, unknown_6;
        uint16_t acct_ctrl, logon_divs;
        uint16_t bad_password_count, logon_count;
@@ -185,21 +184,15 @@ struct samba3_secrets
        } *afs_keyfiles;
 };
 
-struct samba3_parameter {
-       char *name;
-       char *value;
-};
-
 struct samba3_share_info {
        char *name;
        struct security_descriptor secdesc;
-
-       uint32_t parameter_count;
-       struct samba3_parameter *parameters;
 };
 
 struct samba3 
 {
+       struct param_context *configuration;
+
        uint32_t winsdb_count;
        struct samba3_winsdb_entry *winsdb_entries;
        
@@ -216,4 +209,7 @@ struct samba3
        struct samba3_regdb registry;
 };
 
+#include "lib/samba3/samba3_proto.h"
+#include "lib/samba3/samba3_smbpasswd_proto.h"
+
 #endif /* _SAMBA3_H */