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
65
66
|
diff -u -x '*.kde*' -r x2gosessionadministration-2.0.1/src/x2gosessionadministration.cpp x2gosessionadministration-2.0.1-mod/src/x2gosessionadministration.cpp
--- x2gosessionadministration-2.0.1/src/x2gosessionadministration.cpp 2009-02-09 14:39:18.000000000 +0100
+++ x2gosessionadministration-2.0.1-mod/src/x2gosessionadministration.cpp 2009-05-12 18:23:57.000000000 +0200
@@ -118,12 +118,18 @@
QTextStream stream(&file);
uri = stream.readLine();
base = stream.readLine();
+ bindDN = stream.readLine();
+ bindDNPw = stream.readLine();
file.close();
useLDAP=true;
QStringList lst;
lst=lst.split("\"",base);
base=lst[1];
+ lst=lst.split("\"",bindDN);
+ bindDN=lst[1];
+ lst=lst.split("\"",bindDNPw);
+ bindDNPw=lst[1];
lst=lst.split("//",uri);
uri=lst[1];
}
@@ -314,18 +320,18 @@
{
if (useLDAP)
{
- QString passfile="/etc/libnss-ldap.secret";
- QFile file(passfile);
- QCString tpass;
+// QString passfile="/etc/x2go/x2goldaptools.conf";
+// QFile file(passfile);
+// QCString tpass;
+
+// if (file.open(IO_ReadOnly))
+// {
+// QTextStream in(&file);
+// in>>tpass;
+// file.close();
+// }
- if (file.open(IO_ReadOnly))
- {
- QTextStream in(&file);
- in>>tpass;
- file.close();
- }
-
- ld=new LDAPSession(uri,389,"cn=ldapadmin,"+base,tpass.data(),false,true);
+ ld=new LDAPSession(uri,389,(const char*)bindDN,(const char*)bindDNPw,true,false);
}
}
Nur in x2gosessionadministration-2.0.1-mod/src: x2gosessionadministration.cpp~.
diff -u -x '*.kde*' -r x2gosessionadministration-2.0.1/src/x2gosessionadministration.h x2gosessionadministration-2.0.1-mod/src/x2gosessionadministration.h
--- x2gosessionadministration-2.0.1/src/x2gosessionadministration.h 2009-02-09 14:39:18.000000000 +0100
+++ x2gosessionadministration-2.0.1-mod/src/x2gosessionadministration.h 2009-05-12 18:00:58.000000000 +0200
@@ -114,6 +114,8 @@
QString base;
QString uri;
+ QString bindDN;
+ QString bindDNPw;
QString sServer;
QString sClient;
QString sUname;
Nur in x2gosessionadministration-2.0.1-mod/src: x2gosessionadministration.h~.
|
GitWeb
