s3:ldap: Use #ifdef instead of #if for config.h definitions

[samba.git] / source3 / include / registry.h

diff --git a/source3/include/registry.h b/source3/include/registry.h
index 99990eca98c1fddbddf9fa8dec50667bf2f71032..7d2aad9d64d817cd3645b19a015e62d626264999 100644 (file)
--- a/source3/include/registry.h
+++ b/source3/include/registry.h
@@ -45,10 +45,10 @@ struct registry_ops {
        int     (*fetch_values) ( const char *key, struct regval_ctr *val );
        bool    (*store_subkeys)( const char *key, struct regsubkey_ctr *subkeys );
        WERROR  (*create_subkey)(const char *key, const char *subkey);
-       WERROR  (*delete_subkey)(const char *key, const char *subkey);
+       WERROR  (*delete_subkey)(const char *key, const char *subkey, bool lazy);
        bool    (*store_values)( const char *key, struct regval_ctr *val );
-       bool    (*reg_access_check)( const char *keyname, uint32 requested,
-                                    uint32 *granted,
+       bool    (*reg_access_check)( const char *keyname, uint32_t requested,
+                                    uint32_t *granted,
                                     const struct security_token *token );
        WERROR (*get_secdesc)(TALLOC_CTX *mem_ctx, const char *key,
                              struct security_descriptor **psecdesc);
@@ -61,9 +61,9 @@ struct registry_ops {
 /* structure to store the registry handles */
 
 struct registry_key_handle {
-       uint32          type;
+       uint32_t        type;
        char            *name;          /* full name of registry key */
-       uint32          access_granted;
+       uint32_t        access_granted;
        struct registry_ops     *ops;
 };
 
@@ -103,6 +103,7 @@ struct registry_key {
 #define KEY_TCPIP_PARAMS       "HKLM\\SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters"
 #define KEY_PROD_OPTIONS       "HKLM\\SYSTEM\\CurrentControlSet\\Control\\ProductOptions"
 #define KEY_PRINTING           "HKLM\\SYSTEM\\CurrentControlSet\\Control\\Print"
+#define KEY_PCC                        "HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Print\\PackageInstallation"
 #define KEY_PRINTING_2K                "HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Print\\Printers"
 #define KEY_PRINTING_PORTS     "HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Ports"
 #define KEY_CURRENT_VERSION    "HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"
@@ -129,9 +130,4 @@ struct registry_key {
 #define REG_KEY_HKPD           1
 #define REG_KEY_HKPT           2
 
-
-/* The following definitions come from registry/reg_init_smbconf.c  */
-
-WERROR registry_init_smbconf(const char *keyname);
-
 #endif /* _REGISTRY_H */