author | llornkcor <llornkcor> | 2005-08-15 19:23:59 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2005-08-15 19:23:59 (UTC) |
commit | 50074192b3a44030b1a83ce824c148a79d60707f (patch) (unidiff) | |
tree | dfdcd860c43200240de4b281fd0714fdbfefce04 | |
parent | 0771d689056f233fe772d85de4040f59f3ba1e6b (diff) | |
download | opie-50074192b3a44030b1a83ce824c148a79d60707f.zip opie-50074192b3a44030b1a83ce824c148a79d60707f.tar.gz opie-50074192b3a44030b1a83ce824c148a79d60707f.tar.bz2 |
fix use/pass
-rw-r--r-- | noncore/net/opie-smb/qsmb.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/noncore/net/opie-smb/qsmb.cpp b/noncore/net/opie-smb/qsmb.cpp index fbe1c5c..a219c58 100644 --- a/noncore/net/opie-smb/qsmb.cpp +++ b/noncore/net/opie-smb/qsmb.cpp | |||
@@ -107,129 +107,129 @@ void Qsmb::scan() | |||
107 | 107 | ||
108 | sockaddr_in my_addr; | 108 | sockaddr_in my_addr; |
109 | get_myaddress( &my_addr); | 109 | get_myaddress( &my_addr); |
110 | 110 | ||
111 | QString ip = inet_ntoa( my_addr.sin_addr); | 111 | QString ip = inet_ntoa( my_addr.sin_addr); |
112 | owarn << "IP Address : " << ip<< oendl; | 112 | owarn << "IP Address : " << ip<< oendl; |
113 | 113 | ||
114 | match = ip.left(5); | 114 | match = ip.left(5); |
115 | 115 | ||
116 | QStringList ccmd; | 116 | QStringList ccmd; |
117 | TextViewOutput->append("smbfind"); | 117 | TextViewOutput->append("smbfind"); |
118 | 118 | ||
119 | QFile lmhosts("/etc/samba/lmhosts"); | 119 | QFile lmhosts("/etc/samba/lmhosts"); |
120 | QTextStream lms(&lmhosts); | 120 | QTextStream lms(&lmhosts); |
121 | lmhosts.open(IO_WriteOnly); | 121 | lmhosts.open(IO_WriteOnly); |
122 | lms << "127.0.0.1 localhost\n"; | 122 | lms << "127.0.0.1 localhost\n"; |
123 | 123 | ||
124 | /* parse output and display in ListViewScan */ | 124 | /* parse output and display in ListViewScan */ |
125 | ccmd = "smbfind"; | 125 | ccmd = "smbfind"; |
126 | runCommand(ccmd); | 126 | runCommand(ccmd); |
127 | 127 | ||
128 | QTextStream s(&out, IO_ReadOnly); | 128 | QTextStream s(&out, IO_ReadOnly); |
129 | 129 | ||
130 | while ( !s.atEnd() ) { | 130 | while ( !s.atEnd() ) { |
131 | QString ip_addr, host, output; | 131 | QString ip_addr, host, output; |
132 | QString tmp = s.readLine(); | 132 | QString tmp = s.readLine(); |
133 | bool ok; | 133 | bool ok; |
134 | tmp.left(1).toInt( &ok, 10 ); | 134 | tmp.left(1).toInt( &ok, 10 ); |
135 | if(ok) { | 135 | if(ok) { |
136 | QStringList token = QStringList::split(' ', tmp ); | 136 | QStringList token = QStringList::split(' ', tmp ); |
137 | ip_addr = token[0]; | 137 | ip_addr = token[0]; |
138 | host = token[1]; | 138 | host = token[1]; |
139 | CBHost->insertItem( host, -1); | 139 | CBHost->insertItem( host, -1); |
140 | lms << ip_addr+" "+host+"\n"; | 140 | lms << ip_addr+" "+host+"\n"; |
141 | } | 141 | } |
142 | } | 142 | } |
143 | lmhosts.close(); | 143 | lmhosts.close(); |
144 | 144 | ||
145 | TextViewOutput->append("\n\n============================================\n"); | 145 | TextViewOutput->append("\n\n============================================\n"); |
146 | LScan->setText(""); | 146 | LScan->setText(""); |
147 | scanning = false; | 147 | scanning = false; |
148 | } | 148 | } |
149 | 149 | ||
150 | void Qsmb::hostSelected(int index) | 150 | void Qsmb::hostSelected(int index) |
151 | { | 151 | { |
152 | owarn << "hostSelected" << oendl; | 152 | owarn << "hostSelected" << oendl; |
153 | QListViewItem *element; | 153 | QListViewItem *element; |
154 | QListViewItem *parent; | 154 | QListViewItem *parent; |
155 | 155 | ||
156 | QString text = CBHost->currentText(); | 156 | QString text = CBHost->currentText(); |
157 | 157 | ||
158 | if (scanning) return; | 158 | if (scanning) return; |
159 | scanning = true; | 159 | scanning = true; |
160 | 160 | ||
161 | QString cmd; | 161 | QString cmd; |
162 | QStringList ccmd; | 162 | QStringList ccmd; |
163 | 163 | ||
164 | LScan->setText("Scanning..."); | 164 | LScan->setText("Scanning..."); |
165 | 165 | ||
166 | ccmd << "/usr/bin/smbclient"; | 166 | ccmd << "/usr/bin/smbclient"; |
167 | ccmd << "-L"; | 167 | ccmd << "-L"; |
168 | ccmd << CBHost->currentText(); | 168 | ccmd << CBHost->currentText(); |
169 | ccmd << "-N"; | 169 | ccmd << "-N"; |
170 | 170 | ||
171 | if(username->text().isEmpty()) { | 171 | if(!username->text().isEmpty()) { |
172 | } else { | 172 | } else { |
173 | ccmd << "-U"; | 173 | ccmd << "-U"; |
174 | ccmd << username->text()+"\%"+ password->text(); | 174 | ccmd << username->text()+"\%"+ password->text(); |
175 | } | 175 | } |
176 | runCommand(ccmd); | 176 | runCommand(ccmd); |
177 | QTextStream s(&out, IO_ReadOnly); | 177 | QTextStream s(&out, IO_ReadOnly); |
178 | 178 | ||
179 | while ( !s.atEnd() ) { | 179 | while ( !s.atEnd() ) { |
180 | QString share; | 180 | QString share; |
181 | QString comment; | 181 | QString comment; |
182 | QString tmp = s.readLine(); | 182 | QString tmp = s.readLine(); |
183 | 183 | ||
184 | if( tmp.find("$") == -1 && tmp.find("Disk") != -1) { | 184 | if( tmp.find("$") == -1 && tmp.find("Disk") != -1) { |
185 | QStringList token = QStringList::split(' ', tmp ); | 185 | QStringList token = QStringList::split(' ', tmp ); |
186 | share = token[0]; | 186 | share = token[0]; |
187 | comment = token[2]; | 187 | comment = token[2]; |
188 | element = new QListViewItem(ListViewScan,share, comment); | 188 | element = new QListViewItem(ListViewScan,share, comment); |
189 | element->setOpen(true); | 189 | element->setOpen(true); |
190 | // top_element = element; | 190 | // top_element = element; |
191 | // parent = element; | 191 | // parent = element; |
192 | } | 192 | } |
193 | 193 | ||
194 | } | 194 | } |
195 | // owarn << "i="<< index << "cmd:" << cmd << oendl; | 195 | // owarn << "i="<< index << "cmd:" << cmd << oendl; |
196 | 196 | ||
197 | TextViewOutput->append(cmd); | 197 | TextViewOutput->append(cmd); |
198 | 198 | ||
199 | /* run smbclient & read output */ | 199 | /* run smbclient & read output */ |
200 | // if ((pipe = popen(cmd.latin1(), "r")) == NULL) { | 200 | // if ((pipe = popen(cmd.latin1(), "r")) == NULL) { |
201 | // snprintf(result, 256, "Error: Can't run %s", cmd.latin1()); | 201 | // snprintf(result, 256, "Error: Can't run %s", cmd.latin1()); |
202 | // // cmd = "Error: Can't run "+cmd; | 202 | // // cmd = "Error: Can't run "+cmd; |
203 | // TextViewOutput->append(result); | 203 | // TextViewOutput->append(result); |
204 | // return; | 204 | // return; |
205 | // } | 205 | // } |
206 | 206 | ||
207 | /* parse output and display in ListViewScan */ | 207 | /* parse output and display in ListViewScan */ |
208 | // while(fgets(result, 256, pipe) != NULL) { | 208 | // while(fgets(result, 256, pipe) != NULL) { |
209 | // /* put result into TextViewOutput */ | 209 | // /* put result into TextViewOutput */ |
210 | // TextViewOutput->append(result); | 210 | // TextViewOutput->append(result); |
211 | 211 | ||
212 | // if( strchr(result, '$') == NULL ) { | 212 | // if( strchr(result, '$') == NULL ) { |
213 | // char share[256], *ptr1; | 213 | // char share[256], *ptr1; |
214 | 214 | ||
215 | // strcpy(share,result); | 215 | // strcpy(share,result); |
216 | // ptr1 = strchr(share,' '); | 216 | // ptr1 = strchr(share,' '); |
217 | // share[ptr1 - share]='\0'; | 217 | // share[ptr1 - share]='\0'; |
218 | 218 | ||
219 | // owarn<< "add share: " << share << oendl; | 219 | // owarn<< "add share: " << share << oendl; |
220 | 220 | ||
221 | // if(top_element != NULL) { | 221 | // if(top_element != NULL) { |
222 | // bool found = false; | 222 | // bool found = false; |
223 | // element = top_element; | 223 | // element = top_element; |
224 | 224 | ||
225 | // while(element != NULL && !found) { | 225 | // while(element != NULL && !found) { |
226 | // if(strcmp( element->text(0).ascii(), share)==0) { | 226 | // if(strcmp( element->text(0).ascii(), share)==0) { |
227 | // parent = element; | 227 | // parent = element; |
228 | // found = true; | 228 | // found = true; |
229 | // } | 229 | // } |
230 | // element = element->nextSibling(); | 230 | // element = element->nextSibling(); |
231 | // } | 231 | // } |
232 | 232 | ||
233 | // if(!found) { | 233 | // if(!found) { |
234 | // element = new QListViewItem(ListViewScan,share); | 234 | // element = new QListViewItem(ListViewScan,share); |
235 | // element->setOpen(true); | 235 | // element->setOpen(true); |