diff options
| -rw-r--r-- | dbaccess/inc/dbaccess_helpid.hrc | 7 | ||||
| -rw-r--r-- | dbaccess/source/core/api/makefile.mk | 5 | ||||
| -rw-r--r-- | dbaccess/source/ui/dlg/dbadmin.cxx | 7 | ||||
| -rw-r--r-- | dbaccess/source/ui/dlg/dbadmin.hrc | 6 | ||||
| -rw-r--r-- | dbaccess/source/ui/dlg/dbadmin.src | 137 | ||||
| -rw-r--r-- | dbaccess/source/ui/dlg/detailpages.cxx | 22 | ||||
| -rw-r--r-- | dbaccess/source/ui/dlg/detailpages.hxx | 6 | ||||
| -rw-r--r-- | dbaccess/source/ui/dlg/dsitems.hxx | 18 | ||||
| -rw-r--r-- | dbaccess/util/hidother.src | 7 |
9 files changed, 178 insertions, 37 deletions
diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc index 648090ecabe8..3e6e202b67f6 100644 --- a/dbaccess/inc/dbaccess_helpid.hrc +++ b/dbaccess/inc/dbaccess_helpid.hrc @@ -2,9 +2,9 @@ * * $RCSfile: dbaccess_helpid.hrc,v $ * - * $Revision: 1.52 $ + * $Revision: 1.53 $ * - * last change: $Author: hr $ $Date: 2003-03-19 17:51:48 $ + * last change: $Author: yl146652 $ $Date: 2004-01-30 05:04:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -326,6 +326,9 @@ #define HID_DSADMIN_USER_DEFINED (HID_DBACCESS_START + 234) #define HID_DSADMIN_USERDEF_OPTIONS (HID_DBACCESS_START + 235) #define HID_DSADMIN_CHARSET_USERDEF (HID_DBACCESS_START + 236) +#define HID_DSADMIN_USER_LDAP (HID_DBACCESS_START + 237) +#define HID_DSADMIN_PWDREC_LDAP (HID_DBACCESS_START + 238) +#define HID_DSADMIN_USESSL_LDAP (HID_DBACCESS_START + 239) diff --git a/dbaccess/source/core/api/makefile.mk b/dbaccess/source/core/api/makefile.mk index 0a8cd3676919..c893e0b9a2fd 100644 --- a/dbaccess/source/core/api/makefile.mk +++ b/dbaccess/source/core/api/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.11 $ +# $Revision: 1.12 $ # -# last change: $Author: vg $ $Date: 2003-12-16 12:40:29 $ +# last change: $Author: yl146652 $ $Date: 2004-01-30 05:04:46 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -72,7 +72,6 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk # --- Files ------------------------------------- - SLOFILES= \ $(SLO)$/FilteredContainer.obj \ $(SLO)$/TableDeco.obj \ diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index 1f4a29fa032d..e5cb6f495db0 100644 --- a/dbaccess/source/ui/dlg/dbadmin.cxx +++ b/dbaccess/source/ui/dlg/dbadmin.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dbadmin.cxx,v $ * - * $Revision: 1.84 $ + * $Revision: 1.85 $ * - * last change: $Author: hr $ $Date: 2003-03-19 17:52:21 $ + * last change: $Author: yl146652 $ $Date: 2004-01-30 05:04:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -248,6 +248,7 @@ ODbAdminDialog::ODbAdminDialog(Window* _pParent, SfxItemSet* _pItems, const Refe // extra settings for a ldap address book m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_CONN_LDAP_HOSTNAME, ::rtl::OUString::createFromAscii("HostName"))); m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_CONN_LDAP_BASEDN, ::rtl::OUString::createFromAscii("BaseDN"))); + m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_CONN_LDAP_USESSL, ::rtl::OUString::createFromAscii("UseSSL"))); m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_CONN_LDAP_PORTNUMBER, ::rtl::OUString::createFromAscii("PortNumber"))); m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_CONN_LDAP_ROWCOUNT, ::rtl::OUString::createFromAscii("MaxRowCount"))); @@ -747,6 +748,7 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp *pCounter++ = new SfxBoolItem(DSID_USECATALOG, sal_False); *pCounter++ = new SfxStringItem(DSID_CONN_LDAP_HOSTNAME, String()); *pCounter++ = new SfxStringItem(DSID_CONN_LDAP_BASEDN, String()); + *pCounter++ = new SfxBoolItem(DSID_CONN_LDAP_USESSL, sal_False); *pCounter++ = new SfxInt32Item(DSID_CONN_LDAP_PORTNUMBER, 389); *pCounter++ = new SfxInt32Item(DSID_CONN_LDAP_ROWCOUNT, 100); *pCounter++ = new SfxBoolItem(DSID_SQL92CHECK, sal_False); @@ -798,6 +800,7 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp {0,0}, {0,0}, {0,0}, + {0,0}, }; OSL_ENSURE(sizeof(aItemInfos)/sizeof(aItemInfos[0]) == DSID_LAST_ITEM_ID,"Invlaid Ids!"); diff --git a/dbaccess/source/ui/dlg/dbadmin.hrc b/dbaccess/source/ui/dlg/dbadmin.hrc index e5d99c1fed69..ef8ff555e0f0 100644 --- a/dbaccess/source/ui/dlg/dbadmin.hrc +++ b/dbaccess/source/ui/dlg/dbadmin.hrc @@ -2,9 +2,9 @@ * * $RCSfile: dbadmin.hrc,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: vg $ $Date: 2003-06-04 12:17:39 $ + * last change: $Author: yl146652 $ $Date: 2004-01-30 05:04:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -106,6 +106,7 @@ #define ET_AUTOINCREMENTVALUE 10 #define ET_RETRIEVE_AUTO 11 + #define PB_BROWSECONNECTION 1 #define PB_INDICIES 2 #define PB_ADDALLTABLES 3 @@ -126,6 +127,7 @@ #define CB_USECATALOG 6 #define CB_SQL92CHECK 7 #define CB_RETRIEVE_AUTO 8 +#define CB_USESSL 9 #define FL_SEPARATOR1 1 #define FL_SEPARATOR2 2 diff --git a/dbaccess/source/ui/dlg/dbadmin.src b/dbaccess/source/ui/dlg/dbadmin.src index 2593e5925da1..303864e768f1 100644 --- a/dbaccess/source/ui/dlg/dbadmin.src +++ b/dbaccess/source/ui/dlg/dbadmin.src @@ -2,9 +2,9 @@ * * $RCSfile: dbadmin.src,v $ * - * $Revision: 1.130 $ + * $Revision: 1.131 $ * - * last change: $Author: vg $ $Date: 2003-12-17 15:13:29 $ + * last change: $Author: yl146652 $ $Date: 2004-01-30 05:04:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2871,9 +2871,90 @@ TabPage PAGE_LDAP Hide = TRUE; HelpId = HID_DSADMIN_PAGE_LDAP; + FixedText FT_USERNAME + { + Pos = MAP_APPFONT ( 6 , 7 ) ; + Size = MAP_APPFONT ( 80 , 10 ) ; + Text = "~Benutzername" ; + Text [ english ] = "~Username" ; + Text [ NORWEGIAN ] = "~Username" ; + Text [ DANISH ] = "Brugernavn" ; + Text [ english_US ] = "~User name" ; + Text [ SPANISH ] = "N~ombre del usuario" ; + Text [ FINNISH ] = "Kyttjtunnus" ; + Text [ FRENCH ] = "Nom d'~utilisateur" ; + Text [ ITALIAN ] = "Nome ~utente" ; + Text [ DUTCH ] = "~Gebruikersnaam" ; + Text [ SWEDISH ] = "A~nvndarnamn" ; + Text [ PORTUGUESE ] = "Nome do ~utilizador" ; + Text [ portuguese_brazilian ] = "Nome do ~usurio" ; + Text [ chinese_simplified ] = "使用名(~U)"; + Text [ russian ] = " "; + Text [ polish ] = "Nazwa ~uytkownika"; + Text [ japanese ] = "ユーザー名(~U)"; + Text [ chinese_traditional ] = "使用者名稱(~U)"; + Text [ arabic ] = " "; + Text [ greek ] = " "; + Text [ korean ] = "사용자 이름(~U)"; + Text [ turkish ] = "~Kullanc ismi"; + Text [ language_user1 ] = " "; + Text[ catalan ] = "Nom d'~usuari"; + Text[ thai ] = "ชื่อ~ผู้ใช้"; + Text[ czech ] = "Uživatelské jméno"; + Text[ hebrew ] = "~Benutzername"; + Text[ hindi ] = "~उपभोक्ता नाम"; + Text[ slovak ] = "~Užívateľské meno"; + }; + Edit ET_USERNAME + { + Border = TRUE ; + Pos = MAP_APPFONT ( 90 , 6 ) ; + Size = MAP_APPFONT ( 130 , 12 ) ; + TabStop = TRUE ; + HelpId = HID_DSADMIN_USER_LDAP; + }; + CheckBox CB_PASSWORD_REQUIRED + { + Pos = MAP_APPFONT ( 90 , 21 ) ; + Size = MAP_APPFONT ( 105 , CHECKBOX_HEIGHT ) ; + Text = "Kennwort erforderlich"; + Text [ english ] = "Password required"; + Text [ english_us ] = "Password required"; + HelpId = HID_DSADMIN_PWDREC_LDAP; + Text [ portuguese ] = "Necessrio senha"; + Text [ russian ] = " "; + Text [ greek ] = " "; + Text [ dutch ] = "Wachtwoord vereist"; + Text [ french ] = "Mot de passe requis"; + Text [ spanish ] = "Se requiere una contrasea"; + Text [ italian ] = "Password necessaria"; + Text [ danish ] = "Adgangskode ndvendig"; + Text [ swedish ] = "Lsenord krvs"; + Text [ polish ] = "Wymagane haso"; + Text [ portuguese_brazilian ] = "Senha obrigatria"; + Text [ japanese ] = "パスワードが必要"; + Text [ korean ] = "암호 필요"; + Text [ chinese_simplified ] = "必须输入密码"; + Text [ chinese_traditional ] = "必須輸入密碼"; + Text [ turkish ] = "ifre gerekli"; + Text [ arabic ] = " "; + Text[ finnish ] = "Salasana pakollinen"; + Text[ catalan ] = "Es necessita una contrasenya"; + Text[ thai ] = "ต้องการรหัสผ่าน"; + Text[ czech ] = "Požadované heslo"; + Text[ hebrew ] = "Kennwort erforderlich"; + Text[ hindi ] = "कूटशब्द का आवश्यकता"; + Text[ slovak ] = "Požadované heslo"; + }; + FixedLine FL_SEPARATOR1 + { + Pos = MAP_APPFONT ( 4 , 32 ) ; + Size = MAP_APPFONT ( 252 , 1 ) ; + }; + FixedText FT_HOSTNAME { - Pos = MAP_APPFONT ( 6 , 8 ) ; + Pos = MAP_APPFONT ( 6 , 38 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; Text = "~Rechnername" ; Text [ english ] = "~Hostname" ; @@ -2911,12 +2992,12 @@ TabPage PAGE_LDAP Border = TRUE ; HelpId = HID_DSADMIN_LDAP_HOSTNAME; - Pos = MAP_APPFONT ( 91 , 7 ) ; + Pos = MAP_APPFONT ( 91 , 37 ) ; Size = MAP_APPFONT ( 105 , 12 ) ; }; FixedText FT_BASEDN { - Pos = MAP_APPFONT ( 6 , 26 ) ; + Pos = MAP_APPFONT ( 6 , 56 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; Text = "~Base DN" ; Text [ english ] = "~Base DN" ; @@ -2955,17 +3036,51 @@ TabPage PAGE_LDAP Border = TRUE ; HelpId = HID_DSADMIN_LDAP_BASEDN; - Pos = MAP_APPFONT ( 91 , 25 ) ; + Pos = MAP_APPFONT ( 91 , 55 ) ; Size = MAP_APPFONT ( 105 , 12 ) ; }; + CheckBox CB_USESSL + { + Pos = MAP_APPFONT ( 91 , 75 ) ; + Size = MAP_APPFONT ( 105 , CHECKBOX_HEIGHT ) ; + Text = "Use secure connection(SSL)"; + Text [ english ] = "Use secure connection(SSL)"; + Text [ english_us ] = "Use secure connection(SSL)"; + HelpId = HID_DSADMIN_USESSL_LDAP; + Text [ portuguese ] = "Use secure connection(SSL)"; + Text [ russian ] = "Use secure connection(SSL)"; + Text [ greek ] = "Use secure connection(SSL)"; + Text [ dutch ] = "Use secure connection(SSL)"; + Text [ french ] = "Use secure connection(SSL)"; + Text [ spanish ] = "Use secure connection(SSL)"; + Text [ italian ] = "Use secure connection(SSL)"; + Text [ danish ] = "Use secure connection(SSL)"; + Text [ swedish ] = "Use secure connection(SSL)"; + Text [ polish ] = "Use secure connection(SSL)"; + Text [ portuguese_brazilian ] = "Use secure connection(SSL)"; + Text [ japanese ] = "Use secure connection(SSL)"; + Text [ korean ] = "Use secure connection(SSL)"; + Text [ chinese_simplified ] = "Use secure connection(SSL)"; + Text [ chinese_traditional ] = "Use secure connection(SSL)"; + Text [ turkish ] = "Use secure connection(SSL)"; + Text [ arabic ] = "Use secure connection(SSL)"; + Text[ finnish ] = "Use secure connection(SSL)"; + Text[ catalan ] = "Use secure connection(SSL)"; + Text[ thai ] = "Use secure connection(SSL)"; + Text[ czech ] = "Use secure connection(SSL)"; + Text[ hebrew ] = "Use secure connection(SSL)"; + Text[ hindi ] = "Use secure connection(SSL)"; + Text[ slovak ] = "Use secure connection(SSL)"; + }; + FixedLine FL_SEPARATOR2 { - Pos = MAP_APPFONT ( 4 , 42 ) ; + Pos = MAP_APPFONT ( 4 , 90 ) ; Size = MAP_APPFONT ( 252 , 1 ) ; }; FixedText FT_PORTNUMBER { - Pos = MAP_APPFONT ( 6 , 47 ) ; + Pos = MAP_APPFONT ( 6 , 95 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; Text = "~Portnummer" ; Text [ english ] = "~Portnumber" ; @@ -3003,12 +3118,12 @@ TabPage PAGE_LDAP Border = TRUE ; HelpId = HID_DSADMIN_LDAP_PORTNUMBER; - Pos = MAP_APPFONT ( 91 , 48 ) ; + Pos = MAP_APPFONT ( 91 , 96 ) ; Size = MAP_APPFONT ( 105 , 12 ) ; }; FixedText FT_LDAPROWCOUNT { - Pos = MAP_APPFONT ( 6 , 67 ) ; + Pos = MAP_APPFONT ( 6 , 115 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; Text = "~Datenstze (max.)" ; Text [ english ] = "~Rows (max.)" ; @@ -3046,7 +3161,7 @@ TabPage PAGE_LDAP Border = TRUE ; HelpId = HID_DSADMIN_LDAP_ROWCOUNT; - Pos = MAP_APPFONT ( 91 , 66 ) ; + Pos = MAP_APPFONT ( 91 , 114 ) ; Size = MAP_APPFONT ( 105 , 12 ) ; }; }; diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index 03a0cca49439..8169c2264f4f 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -2,9 +2,9 @@ * * $RCSfile: detailpages.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: rt $ $Date: 2004-01-07 15:45:18 $ + * last change: $Author: yl146652 $ $Date: 2004-01-30 05:04:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1190,7 +1190,8 @@ namespace dbaui //= OLDAPDetailsPage //======================================================================== OLDAPDetailsPage::OLDAPDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) - :OCommonBehaviourTabPage(pParent, PAGE_LDAP, _rCoreAttrs, 0) + :OCommonBehaviourTabPage(pParent, PAGE_LDAP, _rCoreAttrs, CBTP_USE_UIDPWD) + ,m_aSeparator1 (this, ResId(FL_SEPARATOR1)) ,m_aHostname (this, ResId(FT_HOSTNAME)) ,m_aETHostname (this, ResId(ET_HOSTNAME)) ,m_aBaseDN (this, ResId(FT_BASEDN)) @@ -1200,9 +1201,11 @@ namespace dbaui ,m_aNFPortNumber (this, ResId(NF_PORTNUMBER)) ,m_aFTRowCount (this, ResId(FT_LDAPROWCOUNT)) ,m_aNFRowCount (this, ResId(NF_LDAPROWCOUNT)) + ,m_aCBUseSSL (this, ResId(CB_USESSL)) { m_aETHostname.SetModifyHdl(getControlModifiedLink()); m_aETBaseDN.SetModifyHdl(getControlModifiedLink()); + m_aCBUseSSL.SetToggleHdl(getControlModifiedLink()); m_aNFPortNumber.SetModifyHdl(getControlModifiedLink()); m_aNFRowCount.SetModifyHdl(getControlModifiedLink()); @@ -1229,6 +1232,7 @@ namespace dbaui { DSID_CONN_LDAP_HOSTNAME, DSID_CONN_LDAP_BASEDN, + DSID_CONN_LDAP_USESSL, DSID_CONN_LDAP_PORTNUMBER, DSID_CONN_LDAP_ROWCOUNT, 0 @@ -1244,6 +1248,11 @@ namespace dbaui FILL_STRING_ITEM(m_aETHostname,_rSet,DSID_CONN_LDAP_HOSTNAME,bChangedSomething) FILL_STRING_ITEM(m_aETBaseDN,_rSet,DSID_CONN_LDAP_BASEDN,bChangedSomething) + if ( m_aCBUseSSL.IsChecked() != m_aCBUseSSL.GetSavedValue() ) + { + _rSet.Put(SfxBoolItem(DSID_CONN_LDAP_USESSL, m_aCBUseSSL.IsChecked())); + bChangedSomething = sal_True; + } if ( m_aNFPortNumber.GetValue() != m_aNFPortNumber.GetSavedValue() ) { _rSet.Put(SfxInt32Item(DSID_CONN_LDAP_PORTNUMBER, m_aNFPortNumber.GetValue())); @@ -1254,7 +1263,6 @@ namespace dbaui _rSet.Put(SfxInt32Item(DSID_CONN_LDAP_ROWCOUNT, m_aNFRowCount.GetValue())); bChangedSomething = sal_True; } - return bChangedSomething; } // ----------------------------------------------------------------------- @@ -1269,6 +1277,7 @@ namespace dbaui SFX_ITEMSET_GET(_rSet, pHostName, SfxStringItem, DSID_CONN_LDAP_HOSTNAME, sal_True); SFX_ITEMSET_GET(_rSet, pBaseDN, SfxStringItem, DSID_CONN_LDAP_BASEDN, sal_True); + SFX_ITEMSET_GET(_rSet, pUseSSL, SfxBoolItem, DSID_CONN_LDAP_USESSL, sal_True); SFX_ITEMSET_GET(_rSet, pPortNumber, SfxInt32Item, DSID_CONN_LDAP_PORTNUMBER, sal_True); SFX_ITEMSET_GET(_rSet, pRowCount, SfxInt32Item, DSID_CONN_LDAP_ROWCOUNT, sal_True); @@ -1277,12 +1286,14 @@ namespace dbaui m_aNFPortNumber.SetValue(pPortNumber->GetValue()); m_aNFRowCount.SetValue(pRowCount->GetValue()); + m_aCBUseSSL.Check(pUseSSL->GetValue()); if (_bSaveValue) { m_aETHostname.SaveValue(); m_aETBaseDN.SaveValue(); m_aNFPortNumber.SaveValue(); m_aNFRowCount.SaveValue(); + m_aCBUseSSL.SaveValue(); } if (bReadonly) @@ -1291,6 +1302,7 @@ namespace dbaui m_aETBaseDN.Disable(); m_aNFPortNumber.Disable(); m_aNFRowCount.Disable(); + m_aCBUseSSL.Disable(); } } @@ -1516,7 +1528,7 @@ namespace dbaui else return sal_True; - ErrorBox(NULL, WB_OK, MnemonicGenerator::EraseAllMnemonicChars( aErrorText)).Execute(); + //ErrorBox(NULL, WB_OK, MnemonicGenerator::EraseAllMnemonicChars( aErrorText)).Execute(); pErrorWin->GrabFocus(); return 0; } diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx index 873aedf78a8d..3e0ee8392fad 100644 --- a/dbaccess/source/ui/dlg/detailpages.hxx +++ b/dbaccess/source/ui/dlg/detailpages.hxx @@ -2,9 +2,9 @@ * * $RCSfile: detailpages.hxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: hr $ $Date: 2003-03-19 17:52:22 $ + * last change: $Author: yl146652 $ $Date: 2004-01-30 05:04:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -345,6 +345,7 @@ namespace dbaui static sal_Int32* getDetailIds(); private: + FixedLine m_aSeparator1; FixedText m_aHostname; Edit m_aETHostname; FixedText m_aBaseDN; @@ -354,6 +355,7 @@ namespace dbaui NumericField m_aNFPortNumber; FixedText m_aFTRowCount; NumericField m_aNFRowCount; + CheckBox m_aCBUseSSL; OLDAPDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); diff --git a/dbaccess/source/ui/dlg/dsitems.hxx b/dbaccess/source/ui/dlg/dsitems.hxx index 5ed7c24eb3fe..5c1ac5df9a24 100644 --- a/dbaccess/source/ui/dlg/dsitems.hxx +++ b/dbaccess/source/ui/dlg/dsitems.hxx @@ -2,9 +2,9 @@ * * $RCSfile: dsitems.hxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: hr $ $Date: 2003-03-19 17:52:24 $ + * last change: $Author: yl146652 $ $Date: 2004-01-30 05:04:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -98,12 +98,14 @@ #define DSID_USECATALOG 31 // should the driver use the catalog name when the database is filebased #define DSID_CONN_LDAP_HOSTNAME 32 #define DSID_CONN_LDAP_BASEDN 33 -#define DSID_CONN_LDAP_PORTNUMBER 34 -#define DSID_CONN_LDAP_ROWCOUNT 35 -#define DSID_SQL92CHECK 36 -#define DSID_AUTOINCREMENTVALUE 37 -#define DSID_AUTORETRIEVEVALUE 38 -#define DSID_AUTORETRIEVEENABLED 39 +#define DSID_CONN_LDAP_USESSL 34 +#define DSID_CONN_LDAP_PORTNUMBER 35 +#define DSID_CONN_LDAP_ROWCOUNT 36 +#define DSID_SQL92CHECK 37 +#define DSID_AUTOINCREMENTVALUE 38 +#define DSID_AUTORETRIEVEVALUE 39 +#define DSID_AUTORETRIEVEENABLED 40 + //======================================================================== diff --git a/dbaccess/util/hidother.src b/dbaccess/util/hidother.src index 6f78d708bf34..a7d9fa8f1d89 100644 --- a/dbaccess/util/hidother.src +++ b/dbaccess/util/hidother.src @@ -2,9 +2,9 @@ * * $RCSfile: hidother.src,v $ * - * $Revision: 1.46 $ + * $Revision: 1.47 $ * - * last change: $Author: hr $ $Date: 2003-03-19 17:53:10 $ + * last change: $Author: yl146652 $ $Date: 2004-01-30 05:04:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -325,6 +325,9 @@ hidspecial HID_DSADMIN_PAGE_USERDRIVER { HelpId = HID_DSADMIN_P hidspecial HID_DSADMIN_USER_DEFINED { HelpId = HID_DSADMIN_USER_DEFINED ; }; hidspecial HID_DSADMIN_USERDEF_OPTIONS { HelpId = HID_DSADMIN_USERDEF_OPTIONS ; }; hidspecial HID_DSADMIN_CHARSET_USERDEF { HelpId = HID_DSADMIN_CHARSET_USERDEF ; }; +hidspecial HID_DSADMIN_USER_LDAP { HelpId = HID_DSADMIN_USER_LDAP ; }; +hidspecial HID_DSADMIN_PWDREC_LDAP { HelpId = HID_DSADMIN_PWDREC_LDAP ; }; +hidspecial HID_DSADMIN_USESSL_LDAP { HelpId = HID_DSADMIN_USESSL_LDAP ; }; |