summaryrefslogtreecommitdiff
blob: 6647dbdd1afd5a3bba822f963df9ea0c078e0e46 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
diff -u -x '*.kde*' -r x2gouseradministration-2.0.1/src/x2gouseradministration.cpp x2gouseradministration-2.0.1-mod/src/x2gouseradministration.cpp
--- x2gouseradministration-2.0.1/src/x2gouseradministration.cpp	2009-02-09 14:39:19.000000000 +0100
+++ x2gouseradministration-2.0.1-mod/src/x2gouseradministration.cpp	2009-05-12 19:22:55.000000000 +0200
@@ -133,6 +133,8 @@
 		QTextStream stream ( &file );
 		uri = stream.readLine();
 		base = stream.readLine();
+                bindDN = stream.readLine();
+                bindDNPw = stream.readLine();
 		file.close();
 	}
 	else
@@ -145,6 +147,10 @@
 	base=lst[1];
 	lst=lst.split ( "//",uri );
 	uri=lst[1];
+        lst=lst.split("\"",bindDN);
+        bindDN=lst[1];
+        lst=lst.split("\"",bindDNPw);
+        bindDNPw=lst[1];
 	kdDebug() <<"base: "<<base<<" uri: "<<uri<<endl;
 	QVBoxLayout* lay=new QVBoxLayout ( this );
 	QFrame* mainFrame=new QFrame ( this );
@@ -491,16 +497,16 @@
 	}
 	else
 	{
-		QString passfile="/etc/libnss-ldap.secret";
-		QFile file ( passfile );
-		QCString tpass;
-		if ( file.open ( IO_ReadOnly ) )
-		{
-			QTextStream in ( &file );
-			in>>tpass;
-			file.close();
-		}
-		ld=new LDAPSession ( uri,389,"cn=ldapadmin,"+base,tpass.data(),false,true );
+// 		QString passfile="/etc/libnss-ldap.secret";
+// 		QFile file ( passfile );
+// 		QCString tpass;
+// 		if ( file.open ( IO_ReadOnly ) )
+// 		{
+// 			QTextStream in ( &file );
+// 			in>>tpass;
+// 			file.close();
+// 		}
+		ld=new LDAPSession ( uri,389,(const char*)bindDN,(const char*)bindDNPw,true,false);
 		leSearchUin->setFocus();
 	}
 	load();
Nur in x2gouseradministration-2.0.1-mod/src: x2gouseradministration.cpp~.
diff -u -x '*.kde*' -r x2gouseradministration-2.0.1/src/x2gouseradministration.h x2gouseradministration-2.0.1-mod/src/x2gouseradministration.h
--- x2gouseradministration-2.0.1/src/x2gouseradministration.h	2009-02-09 14:39:19.000000000 +0100
+++ x2gouseradministration-2.0.1-mod/src/x2gouseradministration.h	2009-05-12 19:28:00.000000000 +0200
@@ -143,6 +143,8 @@
     QGroupBox* gbUsers;
     QString base;
     QString uri;
+    QString bindDN;
+    QString bindDNPw;
     QString prevUText;
     QCString upass;
     QString currentUser;
Nur in x2gouseradministration-2.0.1-mod/src: x2gouseradministration.h~.