|
33 | 33 |
|
34 | 34 | #include "ext/standard/dl.h"
|
35 | 35 | #include "php_ldap.h"
|
36 |
| -#include "ldap_arginfo.h" |
37 | 36 |
|
38 | 37 | #ifdef PHP_WIN32
|
39 | 38 | #include <string.h>
|
|
54 | 53 | #define PHP_LDAP_ESCAPE_FILTER 0x01
|
55 | 54 | #define PHP_LDAP_ESCAPE_DN 0x02
|
56 | 55 |
|
| 56 | +#include "ldap_arginfo.h" |
| 57 | + |
57 | 58 | #if defined(LDAP_CONTROL_PAGEDRESULTS) && !defined(HAVE_LDAP_CONTROL_FIND)
|
58 | 59 | LDAPControl *ldap_control_find( const char *oid, LDAPControl **ctrls, LDAPControl ***nextctrlp)
|
59 | 60 | {
|
@@ -854,210 +855,7 @@ PHP_MINIT_FUNCTION(ldap)
|
854 | 855 | ldap_result_entry_object_handlers.clone_obj = NULL;
|
855 | 856 | ldap_result_entry_object_handlers.compare = zend_objects_not_comparable;
|
856 | 857 |
|
857 |
| - /* Constants to be used with deref-parameter in php_ldap_do_search() */ |
858 |
| - REGISTER_LONG_CONSTANT("LDAP_DEREF_NEVER", LDAP_DEREF_NEVER, CONST_PERSISTENT | CONST_CS); |
859 |
| - REGISTER_LONG_CONSTANT("LDAP_DEREF_SEARCHING", LDAP_DEREF_SEARCHING, CONST_PERSISTENT | CONST_CS); |
860 |
| - REGISTER_LONG_CONSTANT("LDAP_DEREF_FINDING", LDAP_DEREF_FINDING, CONST_PERSISTENT | CONST_CS); |
861 |
| - REGISTER_LONG_CONSTANT("LDAP_DEREF_ALWAYS", LDAP_DEREF_ALWAYS, CONST_PERSISTENT | CONST_CS); |
862 |
| - |
863 |
| - /* Constants to be used with ldap_modify_batch() */ |
864 |
| - REGISTER_LONG_CONSTANT("LDAP_MODIFY_BATCH_ADD", LDAP_MODIFY_BATCH_ADD, CONST_PERSISTENT | CONST_CS); |
865 |
| - REGISTER_LONG_CONSTANT("LDAP_MODIFY_BATCH_REMOVE", LDAP_MODIFY_BATCH_REMOVE, CONST_PERSISTENT | CONST_CS); |
866 |
| - REGISTER_LONG_CONSTANT("LDAP_MODIFY_BATCH_REMOVE_ALL", LDAP_MODIFY_BATCH_REMOVE_ALL, CONST_PERSISTENT | CONST_CS); |
867 |
| - REGISTER_LONG_CONSTANT("LDAP_MODIFY_BATCH_REPLACE", LDAP_MODIFY_BATCH_REPLACE, CONST_PERSISTENT | CONST_CS); |
868 |
| - REGISTER_STRING_CONSTANT("LDAP_MODIFY_BATCH_ATTRIB", LDAP_MODIFY_BATCH_ATTRIB, CONST_PERSISTENT | CONST_CS); |
869 |
| - REGISTER_STRING_CONSTANT("LDAP_MODIFY_BATCH_MODTYPE", LDAP_MODIFY_BATCH_MODTYPE, CONST_PERSISTENT | CONST_CS); |
870 |
| - REGISTER_STRING_CONSTANT("LDAP_MODIFY_BATCH_VALUES", LDAP_MODIFY_BATCH_VALUES, CONST_PERSISTENT | CONST_CS); |
871 |
| - |
872 |
| -#if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) |
873 |
| - /* LDAP options */ |
874 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_DEREF", LDAP_OPT_DEREF, CONST_PERSISTENT | CONST_CS); |
875 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_SIZELIMIT", LDAP_OPT_SIZELIMIT, CONST_PERSISTENT | CONST_CS); |
876 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_TIMELIMIT", LDAP_OPT_TIMELIMIT, CONST_PERSISTENT | CONST_CS); |
877 |
| -#ifdef LDAP_OPT_NETWORK_TIMEOUT |
878 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_NETWORK_TIMEOUT", LDAP_OPT_NETWORK_TIMEOUT, CONST_PERSISTENT | CONST_CS); |
879 |
| -#elif defined (LDAP_X_OPT_CONNECT_TIMEOUT) |
880 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_NETWORK_TIMEOUT", LDAP_X_OPT_CONNECT_TIMEOUT, CONST_PERSISTENT | CONST_CS); |
881 |
| -#endif |
882 |
| -#ifdef LDAP_OPT_TIMEOUT |
883 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_TIMEOUT", LDAP_OPT_TIMEOUT, CONST_PERSISTENT | CONST_CS); |
884 |
| -#endif |
885 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_PROTOCOL_VERSION", LDAP_OPT_PROTOCOL_VERSION, CONST_PERSISTENT | CONST_CS); |
886 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_ERROR_NUMBER", LDAP_OPT_ERROR_NUMBER, CONST_PERSISTENT | CONST_CS); |
887 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_REFERRALS", LDAP_OPT_REFERRALS, CONST_PERSISTENT | CONST_CS); |
888 |
| -#ifdef LDAP_OPT_RESTART |
889 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_RESTART", LDAP_OPT_RESTART, CONST_PERSISTENT | CONST_CS); |
890 |
| -#endif |
891 |
| -#ifdef LDAP_OPT_HOST_NAME |
892 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_HOST_NAME", LDAP_OPT_HOST_NAME, CONST_PERSISTENT | CONST_CS); |
893 |
| -#endif |
894 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_ERROR_STRING", LDAP_OPT_ERROR_STRING, CONST_PERSISTENT | CONST_CS); |
895 |
| -#ifdef LDAP_OPT_MATCHED_DN |
896 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_MATCHED_DN", LDAP_OPT_MATCHED_DN, CONST_PERSISTENT | CONST_CS); |
897 |
| -#endif |
898 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_SERVER_CONTROLS", LDAP_OPT_SERVER_CONTROLS, CONST_PERSISTENT | CONST_CS); |
899 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_CLIENT_CONTROLS", LDAP_OPT_CLIENT_CONTROLS, CONST_PERSISTENT | CONST_CS); |
900 |
| -#endif |
901 |
| -#ifdef LDAP_OPT_DEBUG_LEVEL |
902 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_DEBUG_LEVEL", LDAP_OPT_DEBUG_LEVEL, CONST_PERSISTENT | CONST_CS); |
903 |
| -#endif |
904 |
| - |
905 |
| -#ifdef LDAP_OPT_DIAGNOSTIC_MESSAGE |
906 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_DIAGNOSTIC_MESSAGE", LDAP_OPT_DIAGNOSTIC_MESSAGE, CONST_PERSISTENT | CONST_CS); |
907 |
| -#endif |
908 |
| - |
909 |
| -#ifdef HAVE_LDAP_SASL |
910 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_X_SASL_MECH", LDAP_OPT_X_SASL_MECH, CONST_PERSISTENT | CONST_CS); |
911 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_X_SASL_REALM", LDAP_OPT_X_SASL_REALM, CONST_PERSISTENT | CONST_CS); |
912 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_X_SASL_AUTHCID", LDAP_OPT_X_SASL_AUTHCID, CONST_PERSISTENT | CONST_CS); |
913 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_X_SASL_AUTHZID", LDAP_OPT_X_SASL_AUTHZID, CONST_PERSISTENT | CONST_CS); |
914 |
| -#endif |
915 |
| -#ifdef LDAP_OPT_X_SASL_NOCANON |
916 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_X_SASL_NOCANON", LDAP_OPT_X_SASL_NOCANON, CONST_PERSISTENT | CONST_CS); |
917 |
| -#endif |
918 |
| -#ifdef LDAP_OPT_X_SASL_USERNAME |
919 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_X_SASL_USERNAME", LDAP_OPT_X_SASL_USERNAME, CONST_PERSISTENT | CONST_CS); |
920 |
| -#endif |
921 |
| - |
922 |
| -#ifdef ORALDAP |
923 |
| - REGISTER_LONG_CONSTANT("GSLC_SSL_NO_AUTH", GSLC_SSL_NO_AUTH, CONST_PERSISTENT | CONST_CS); |
924 |
| - REGISTER_LONG_CONSTANT("GSLC_SSL_ONEWAY_AUTH", GSLC_SSL_ONEWAY_AUTH, CONST_PERSISTENT | CONST_CS); |
925 |
| - REGISTER_LONG_CONSTANT("GSLC_SSL_TWOWAY_AUTH", GSLC_SSL_TWOWAY_AUTH, CONST_PERSISTENT | CONST_CS); |
926 |
| -#endif |
927 |
| - |
928 |
| -#if (LDAP_API_VERSION > 2000) |
929 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_REQUIRE_CERT", LDAP_OPT_X_TLS_REQUIRE_CERT, CONST_PERSISTENT | CONST_CS); |
930 |
| - |
931 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_NEVER", LDAP_OPT_X_TLS_NEVER, CONST_PERSISTENT | CONST_CS); |
932 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_HARD", LDAP_OPT_X_TLS_HARD, CONST_PERSISTENT | CONST_CS); |
933 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_DEMAND", LDAP_OPT_X_TLS_DEMAND, CONST_PERSISTENT | CONST_CS); |
934 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_ALLOW", LDAP_OPT_X_TLS_ALLOW, CONST_PERSISTENT | CONST_CS); |
935 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_TRY", LDAP_OPT_X_TLS_TRY, CONST_PERSISTENT | CONST_CS); |
936 |
| - |
937 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_CACERTDIR", LDAP_OPT_X_TLS_CACERTDIR, CONST_PERSISTENT | CONST_CS); |
938 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_CACERTFILE", LDAP_OPT_X_TLS_CACERTFILE, CONST_PERSISTENT | CONST_CS); |
939 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_CERTFILE", LDAP_OPT_X_TLS_CERTFILE, CONST_PERSISTENT | CONST_CS); |
940 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_CIPHER_SUITE", LDAP_OPT_X_TLS_CIPHER_SUITE, CONST_PERSISTENT | CONST_CS); |
941 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_KEYFILE", LDAP_OPT_X_TLS_KEYFILE, CONST_PERSISTENT | CONST_CS); |
942 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_RANDOM_FILE", LDAP_OPT_X_TLS_RANDOM_FILE, CONST_PERSISTENT | CONST_CS); |
943 |
| -#endif |
944 |
| - |
945 |
| -#ifdef LDAP_OPT_X_TLS_CRLCHECK |
946 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_CRLCHECK", LDAP_OPT_X_TLS_CRLCHECK, CONST_PERSISTENT | CONST_CS); |
947 |
| - |
948 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_CRL_NONE", LDAP_OPT_X_TLS_CRL_NONE, CONST_PERSISTENT | CONST_CS); |
949 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_CRL_PEER", LDAP_OPT_X_TLS_CRL_PEER, CONST_PERSISTENT | CONST_CS); |
950 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_CRL_ALL", LDAP_OPT_X_TLS_CRL_ALL, CONST_PERSISTENT | CONST_CS); |
951 |
| -#endif |
952 |
| - |
953 |
| -#ifdef LDAP_OPT_X_TLS_DHFILE |
954 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_DHFILE", LDAP_OPT_X_TLS_DHFILE, CONST_PERSISTENT | CONST_CS); |
955 |
| -#endif |
956 |
| - |
957 |
| -#ifdef LDAP_OPT_X_TLS_CRLFILE |
958 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_CRLFILE", LDAP_OPT_X_TLS_CRLFILE, CONST_PERSISTENT | CONST_CS); |
959 |
| -#endif |
960 |
| - |
961 |
| -#ifdef LDAP_OPT_X_TLS_PROTOCOL_MIN |
962 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_PROTOCOL_MIN", LDAP_OPT_X_TLS_PROTOCOL_MIN, CONST_PERSISTENT | CONST_CS); |
963 |
| - |
964 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_PROTOCOL_SSL2", LDAP_OPT_X_TLS_PROTOCOL_SSL2, CONST_PERSISTENT | CONST_CS); |
965 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_PROTOCOL_SSL3", LDAP_OPT_X_TLS_PROTOCOL_SSL3, CONST_PERSISTENT | CONST_CS); |
966 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_PROTOCOL_TLS1_0", LDAP_OPT_X_TLS_PROTOCOL_TLS1_0, CONST_PERSISTENT | CONST_CS); |
967 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_PROTOCOL_TLS1_1", LDAP_OPT_X_TLS_PROTOCOL_TLS1_1, CONST_PERSISTENT | CONST_CS); |
968 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_PROTOCOL_TLS1_2", LDAP_OPT_X_TLS_PROTOCOL_TLS1_2, CONST_PERSISTENT | CONST_CS); |
969 |
| -#endif |
970 |
| - |
971 |
| -#ifdef LDAP_OPT_X_TLS_PACKAGE |
972 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_PACKAGE", LDAP_OPT_X_TLS_PACKAGE, CONST_PERSISTENT | CONST_CS); |
973 |
| -#endif |
974 |
| - |
975 |
| -#ifdef LDAP_OPT_X_KEEPALIVE_IDLE |
976 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_X_KEEPALIVE_IDLE", LDAP_OPT_X_KEEPALIVE_IDLE, CONST_PERSISTENT | CONST_CS); |
977 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_X_KEEPALIVE_PROBES", LDAP_OPT_X_KEEPALIVE_PROBES, CONST_PERSISTENT | CONST_CS); |
978 |
| - REGISTER_LONG_CONSTANT("LDAP_OPT_X_KEEPALIVE_INTERVAL", LDAP_OPT_X_KEEPALIVE_INTERVAL, CONST_PERSISTENT | CONST_CS); |
979 |
| -#endif |
980 |
| - |
981 |
| - REGISTER_LONG_CONSTANT("LDAP_ESCAPE_FILTER", PHP_LDAP_ESCAPE_FILTER, CONST_PERSISTENT | CONST_CS); |
982 |
| - REGISTER_LONG_CONSTANT("LDAP_ESCAPE_DN", PHP_LDAP_ESCAPE_DN, CONST_PERSISTENT | CONST_CS); |
983 |
| - |
984 |
| -#ifdef HAVE_LDAP_EXTENDED_OPERATION_S |
985 |
| - REGISTER_STRING_CONSTANT("LDAP_EXOP_START_TLS", LDAP_EXOP_START_TLS, CONST_PERSISTENT | CONST_CS); |
986 |
| - REGISTER_STRING_CONSTANT("LDAP_EXOP_MODIFY_PASSWD", LDAP_EXOP_MODIFY_PASSWD, CONST_PERSISTENT | CONST_CS); |
987 |
| - REGISTER_STRING_CONSTANT("LDAP_EXOP_REFRESH", LDAP_EXOP_REFRESH, CONST_PERSISTENT | CONST_CS); |
988 |
| - REGISTER_STRING_CONSTANT("LDAP_EXOP_WHO_AM_I", LDAP_EXOP_WHO_AM_I, CONST_PERSISTENT | CONST_CS); |
989 |
| - REGISTER_STRING_CONSTANT("LDAP_EXOP_TURN", LDAP_EXOP_TURN, CONST_PERSISTENT | CONST_CS); |
990 |
| -#endif |
991 |
| - |
992 |
| -/* LDAP Controls */ |
993 |
| -/* standard track controls */ |
994 |
| -#ifdef LDAP_CONTROL_MANAGEDSAIT |
995 |
| - /* RFC 3296 */ |
996 |
| - REGISTER_STRING_CONSTANT("LDAP_CONTROL_MANAGEDSAIT", LDAP_CONTROL_MANAGEDSAIT, CONST_PERSISTENT | CONST_CS); |
997 |
| -#endif |
998 |
| -#ifdef LDAP_CONTROL_PROXY_AUTHZ |
999 |
| - /* RFC 4370 */ |
1000 |
| - REGISTER_STRING_CONSTANT("LDAP_CONTROL_PROXY_AUTHZ", LDAP_CONTROL_PROXY_AUTHZ, CONST_PERSISTENT | CONST_CS); |
1001 |
| -#endif |
1002 |
| -#ifdef LDAP_CONTROL_SUBENTRIES |
1003 |
| - /* RFC 3672 */ |
1004 |
| - REGISTER_STRING_CONSTANT("LDAP_CONTROL_SUBENTRIES", LDAP_CONTROL_SUBENTRIES, CONST_PERSISTENT | CONST_CS); |
1005 |
| -#endif |
1006 |
| -#ifdef LDAP_CONTROL_VALUESRETURNFILTER |
1007 |
| - /* RFC 3876 */ |
1008 |
| - REGISTER_STRING_CONSTANT("LDAP_CONTROL_VALUESRETURNFILTER", LDAP_CONTROL_VALUESRETURNFILTER, CONST_PERSISTENT | CONST_CS); |
1009 |
| -#endif |
1010 |
| -#ifdef LDAP_CONTROL_ASSERT |
1011 |
| - /* RFC 4528 */ |
1012 |
| - REGISTER_STRING_CONSTANT("LDAP_CONTROL_ASSERT", LDAP_CONTROL_ASSERT, CONST_PERSISTENT | CONST_CS); |
1013 |
| - /* RFC 4527 */ |
1014 |
| - REGISTER_STRING_CONSTANT("LDAP_CONTROL_PRE_READ", LDAP_CONTROL_PRE_READ, CONST_PERSISTENT | CONST_CS); |
1015 |
| - REGISTER_STRING_CONSTANT("LDAP_CONTROL_POST_READ", LDAP_CONTROL_POST_READ, CONST_PERSISTENT | CONST_CS); |
1016 |
| -#endif |
1017 |
| -#ifdef LDAP_CONTROL_SORTREQUEST |
1018 |
| - /* RFC 2891 */ |
1019 |
| - REGISTER_STRING_CONSTANT("LDAP_CONTROL_SORTREQUEST", LDAP_CONTROL_SORTREQUEST, CONST_PERSISTENT | CONST_CS); |
1020 |
| - REGISTER_STRING_CONSTANT("LDAP_CONTROL_SORTRESPONSE", LDAP_CONTROL_SORTRESPONSE, CONST_PERSISTENT | CONST_CS); |
1021 |
| -#endif |
1022 |
| -/* non-standard track controls */ |
1023 |
| -#ifdef LDAP_CONTROL_PAGEDRESULTS |
1024 |
| - /* RFC 2696 */ |
1025 |
| - REGISTER_STRING_CONSTANT("LDAP_CONTROL_PAGEDRESULTS", LDAP_CONTROL_PAGEDRESULTS, CONST_PERSISTENT | CONST_CS); |
1026 |
| -#endif |
1027 |
| -#ifdef LDAP_CONTROL_AUTHZID_REQUEST |
1028 |
| - /* RFC 3829 */ |
1029 |
| - REGISTER_STRING_CONSTANT("LDAP_CONTROL_AUTHZID_REQUEST", LDAP_CONTROL_AUTHZID_REQUEST, CONST_PERSISTENT | CONST_CS); |
1030 |
| - REGISTER_STRING_CONSTANT("LDAP_CONTROL_AUTHZID_RESPONSE", LDAP_CONTROL_AUTHZID_RESPONSE, CONST_PERSISTENT | CONST_CS); |
1031 |
| -#endif |
1032 |
| -#ifdef LDAP_CONTROL_SYNC |
1033 |
| - /* LDAP Content Synchronization Operation -- RFC 4533 */ |
1034 |
| - REGISTER_STRING_CONSTANT("LDAP_CONTROL_SYNC", LDAP_CONTROL_SYNC, CONST_PERSISTENT | CONST_CS); |
1035 |
| - REGISTER_STRING_CONSTANT("LDAP_CONTROL_SYNC_STATE", LDAP_CONTROL_SYNC_STATE, CONST_PERSISTENT | CONST_CS); |
1036 |
| - REGISTER_STRING_CONSTANT("LDAP_CONTROL_SYNC_DONE", LDAP_CONTROL_SYNC_DONE, CONST_PERSISTENT | CONST_CS); |
1037 |
| -#endif |
1038 |
| -#ifdef LDAP_CONTROL_DONTUSECOPY |
1039 |
| - /* LDAP Don't Use Copy Control (RFC 6171) */ |
1040 |
| - REGISTER_STRING_CONSTANT("LDAP_CONTROL_DONTUSECOPY", LDAP_CONTROL_DONTUSECOPY, CONST_PERSISTENT | CONST_CS); |
1041 |
| -#endif |
1042 |
| -#ifdef LDAP_CONTROL_PASSWORDPOLICYREQUEST |
1043 |
| - /* Password policy Controls */ |
1044 |
| - REGISTER_STRING_CONSTANT("LDAP_CONTROL_PASSWORDPOLICYREQUEST", LDAP_CONTROL_PASSWORDPOLICYREQUEST, CONST_PERSISTENT | CONST_CS); |
1045 |
| - REGISTER_STRING_CONSTANT("LDAP_CONTROL_PASSWORDPOLICYRESPONSE", LDAP_CONTROL_PASSWORDPOLICYRESPONSE, CONST_PERSISTENT | CONST_CS); |
1046 |
| -#endif |
1047 |
| -#ifdef LDAP_CONTROL_X_INCREMENTAL_VALUES |
1048 |
| - /* MS Active Directory controls */ |
1049 |
| - REGISTER_STRING_CONSTANT("LDAP_CONTROL_X_INCREMENTAL_VALUES", LDAP_CONTROL_X_INCREMENTAL_VALUES, CONST_PERSISTENT | CONST_CS); |
1050 |
| - REGISTER_STRING_CONSTANT("LDAP_CONTROL_X_DOMAIN_SCOPE", LDAP_CONTROL_X_DOMAIN_SCOPE, CONST_PERSISTENT | CONST_CS); |
1051 |
| - REGISTER_STRING_CONSTANT("LDAP_CONTROL_X_PERMISSIVE_MODIFY", LDAP_CONTROL_X_PERMISSIVE_MODIFY, CONST_PERSISTENT | CONST_CS); |
1052 |
| - REGISTER_STRING_CONSTANT("LDAP_CONTROL_X_SEARCH_OPTIONS", LDAP_CONTROL_X_SEARCH_OPTIONS, CONST_PERSISTENT | CONST_CS); |
1053 |
| - REGISTER_STRING_CONSTANT("LDAP_CONTROL_X_TREE_DELETE", LDAP_CONTROL_X_TREE_DELETE, CONST_PERSISTENT | CONST_CS); |
1054 |
| - REGISTER_STRING_CONSTANT("LDAP_CONTROL_X_EXTENDED_DN", LDAP_CONTROL_X_EXTENDED_DN, CONST_PERSISTENT | CONST_CS); |
1055 |
| -#endif |
1056 |
| -#ifdef LDAP_CONTROL_VLVREQUEST |
1057 |
| - /* LDAP VLV */ |
1058 |
| - REGISTER_STRING_CONSTANT("LDAP_CONTROL_VLVREQUEST", LDAP_CONTROL_VLVREQUEST, CONST_PERSISTENT | CONST_CS); |
1059 |
| - REGISTER_STRING_CONSTANT("LDAP_CONTROL_VLVRESPONSE", LDAP_CONTROL_VLVRESPONSE, CONST_PERSISTENT | CONST_CS); |
1060 |
| -#endif |
| 858 | + register_ldap_symbols(module_number); |
1061 | 859 |
|
1062 | 860 | ldap_module_entry.type = type;
|
1063 | 861 |
|
|
0 commit comments