[sginsberg] 37846: - Fix some redefinitions

Author: sginsberg
Date: Thu Dec  4 08:11:57 2008
New Revision: 37846

URL: http://svn.reactos.org/svn/reactos?rev=37846&view=rev
Log:
- Fix some redefinitions

Modified:
    trunk/reactos/include/psdk/ntsecpkg.h
    trunk/reactos/include/psdk/sspi.h

Modified: trunk/reactos/include/psdk/ntsecpkg.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecpkg.h?rev...
==============================================================================
--- trunk/reactos/include/psdk/ntsecpkg.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/ntsecpkg.h [iso-8859-1] Thu Dec  4 08:11:57 2008
@@ -432,41 +432,4 @@
 typedef NTSTATUS (WINAPI *SpUserModeInitializeFn)(ULONG, PULONG,
  PSECPKG_USER_FUNCTION_TABLE *, PULONG);

-#define ISC_REQ_DELEGATE 1
-#define ISC_REQ_MUTUAL_AUTH 2
-#define ISC_REQ_REPLAY_DETECT 4
-#define ISC_REQ_SEQUENCE_DETECT 8
-#define ISC_REQ_CONFIDENTIALITY  16
-#define ISC_REQ_USE_SESSION_KEY 32
-#define ISC_REQ_PROMPT_FOR_CREDS 64
-#define ISC_REQ_USE_SUPPLIED_CREDS  128
-#define ISC_REQ_ALLOCATE_MEMORY 256
-#define ISC_REQ_USE_DCE_STYLE 512
-#define ISC_REQ_DATAGRAM 1024
-#define ISC_REQ_CONNECTION 2048
-#define ISC_REQ_EXTENDED_ERROR 16384
-#define ISC_REQ_STREAM 32768
-#define ISC_REQ_INTEGRITY 65536
-#define ISC_REQ_MANUAL_CRED_VALIDATION 524288
-#define ISC_REQ_HTTP  268435456
-
-#define ISC_RET_EXTENDED_ERROR 16384
-
-#define ASC_REQ_DELEGATE 1
-#define ASC_REQ_MUTUAL_AUTH 2
-#define ASC_REQ_REPLAY_DETECT 4
-#define ASC_REQ_SEQUENCE_DETECT 8
-#define ASC_REQ_CONFIDENTIALITY 16
-#define ASC_REQ_USE_SESSION_KEY 32
-#define ASC_REQ_ALLOCATE_MEMORY 256
-#define ASC_REQ_USE_DCE_STYLE 512
-#define ASC_REQ_DATAGRAM 1024
-#define ASC_REQ_CONNECTION 2048
-#define ASC_REQ_EXTENDED_ERROR 32768
-#define ASC_REQ_STREAM 65536
-#define ASC_REQ_INTEGRITY 131072
-
-#define SECURITY_NATIVE_DREP  16
-#define SECURITY_NETWORK_DREP 0
-
 #endif /* _NTSECPKG_H */

Modified: trunk/reactos/include/psdk/sspi.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sspi.h?rev=378...
==============================================================================
--- trunk/reactos/include/psdk/sspi.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/sspi.h [iso-8859-1] Thu Dec  4 08:11:57 2008
@@ -367,9 +367,10 @@
 #define ASC_RET_FRAGMENT_ONLY          0x00800000
 #define ASC_RET_NO_TOKEN               0x01000000

-/* values for TargetDataRep */
-#define SECURITY_NATIVE_DREP  0x00000010
-#define SECURITY_NETWORK_DREP 0x00000000
+/*Vvalues for TargetDataRep */
+#define SECURITY_NATIVE_DREP           0x00000010
+#define SECURITY_NETWORK_DREP          0x00000000
+

SECURITY_STATUS SEC_ENTRY CompleteAuthToken(PCtxtHandle phContext,
  PSecBufferDesc pToken);
@@ -421,13 +422,6 @@
 #define SECPKG_ATTR_ACCESS_TOKEN       18
 #define SECPKG_ATTR_TARGET             19
 #define SECPKG_ATTR_AUTHENTICATION_ID  20
-#define SECPKG_ATTR_ISSUER_LIST        80
-#define SECPKG_ATTR_REMOTE_CRED        81
-#define SECPKG_ATTR_LOCAL_CRED         82
-#define SECPKG_ATTR_REMOTE_CERT_CONTEXT 83
-#define SECPKG_ATTR_LOCAL_CERT_CONTEXT 84
-#define SECPKG_ATTR_ISSUER_LIST_EX     89
-#define SECPKG_ATTR_CONNECTION_INFO    90

/* types for QueryContextAttributes/SetContextAttributes */