s3:rpc_server/netlogon: reject validation level 6 without ads support

metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Fri Feb  4 10:06:26 CET 2011 on sn-devel-104

diff --git a/source3/rpc_server/srv_netlog_nt.c b/source3/rpc_server/srv_netlog_nt.c
index 11fa9462dacf1b0872a17ec9dba136d6955fc7e3..397c658dd4d7f52b7b07840057c67557d18b5efe 100644 (file)
--- a/source3/rpc_server/srv_netlog_nt.c
+++ b/source3/rpc_server/srv_netlog_nt.c
@@ -1314,7 +1314,13 @@ static NTSTATUS _netr_LogonSamLogon_check(const struct netr_LogonSamLogonEx *r)
                switch (r->in.validation_level) {
                case NetlogonValidationSamInfo:  /* 2 */
                case NetlogonValidationSamInfo2: /* 3 */
+                       break;
                case NetlogonValidationSamInfo4: /* 6 */
+                       if ((pdb_capabilities() & PDB_CAP_ADS) == 0) {
+                               DEBUG(10,("Not adding validation info level 6 "
+                                  "without ADS passdb backend\n"));
+                               return NT_STATUS_INVALID_INFO_CLASS;
+                       }
                        break;
                default:
                        return NT_STATUS_INVALID_INFO_CLASS;
@@ -1330,7 +1336,13 @@ static NTSTATUS _netr_LogonSamLogon_check(const struct netr_LogonSamLogonEx *r)
                switch (r->in.validation_level) {
                case NetlogonValidationSamInfo:  /* 2 */
                case NetlogonValidationSamInfo2: /* 3 */
+                       break;
                case NetlogonValidationSamInfo4: /* 6 */
+                       if ((pdb_capabilities() & PDB_CAP_ADS) == 0) {
+                               DEBUG(10,("Not adding validation info level 6 "
+                                  "without ADS passdb backend\n"));
+                               return NT_STATUS_INVALID_INFO_CLASS;
+                       }
                        break;
                default:
                        return NT_STATUS_INVALID_INFO_CLASS;
@@ -1343,6 +1355,9 @@ static NTSTATUS _netr_LogonSamLogon_check(const struct netr_LogonSamLogonEx *r)
                        return NT_STATUS_INVALID_PARAMETER;
                }
 
+               /* we don't support this here */
+               return NT_STATUS_INVALID_PARAMETER;
+#if 0
                switch (r->in.validation_level) {
                /* TODO: case NetlogonValidationGenericInfo: 4 */
                case NetlogonValidationGenericInfo2: /* 5 */
@@ -1352,6 +1367,7 @@ static NTSTATUS _netr_LogonSamLogon_check(const struct netr_LogonSamLogonEx *r)
                }
 
                break;
+#endif
        default:
                return NT_STATUS_INVALID_PARAMETER;
        }