[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdelibs/kdeprint/management
From:       Cristian Tibirna <tibirna () kde ! org>
Date:       2005-10-13 2:18:37
Message-ID: 1129169917.701169.15986.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 470045 by tibirna:

use WINS for SMB printer detection. Thanks to Gerard Macinenti for
patch. Backport of r469327, bug 113763 fixed.


 M  +42 -2     smbview.cpp  
 M  +1 -0      smbview.h  


--- branches/KDE/3.5/kdelibs/kdeprint/management/smbview.cpp #470044:470045
@@ -30,6 +30,11 @@
 #include <kmessagebox.h>
 #include <kcursor.h>
 
+#include <qfile.h>
+#include <qtextstream.h>
+#include <cstdlib>
+
+
 //*********************************************************************************************
  
 SmbView::SmbView(QWidget *parent, const char *name)
@@ -125,7 +130,42 @@
 
 void SmbView::init()
 {
-	QString	cmd("nmblookup -M -- - | grep '<01>' | awk '{print $1}' | xargs nmblookup \
-A | grep '<1d>'"); +	// Open Samba configuration file and check if a WINS server is \
defined +	m_wins_server = QString::null;
+	QString wins_keyword("wins server");	
+	QFile smb_conf ("/etc/samba/smb.conf");
+	if (smb_conf.exists () && smb_conf.open (IO_ReadOnly))
+	{
+		QTextStream smb_stream (&smb_conf);
+		while (!smb_stream.atEnd ())
+		{
+			QString smb_line = smb_stream.readLine ();
+			if (smb_line.contains (wins_keyword, FALSE) > 0)
+			{
+				QString key = smb_line.section ('=', 0, 0);
+				key = key.stripWhiteSpace();
+				if (key.contains(wins_keyword, FALSE) * wins_keyword.contains(key, FALSE) != 1)
+				{
+					continue;
+				}
+				m_wins_server = smb_line.section ('=', 1, 1);
+				// take only the first declared WINS server
+				m_wins_server = m_wins_server.section(',', 0, 0);
+				m_wins_server = m_wins_server.stripWhiteSpace ();
+				m_wins_server = m_wins_server.section(' ', 0, 0);
+				// strip any server tag (see man smb.conf(5))
+				if (m_wins_server.section(':', 1, 1) != NULL)
+				{
+					m_wins_server = m_wins_server.section(':', 1, 1);
+				}
+				break;
+			}
+		}
+		smb_conf.close ();
+	}
+	m_wins_server = m_wins_server.isEmpty ()? " " : " -U " + m_wins_server + " ";
+	QString cmd ("nmblookup" + m_wins_server +
+					"-M -- - | grep '<01>' | awk '{print $1}' | xargs nmblookup -A | grep '<1d>'");
 	*m_proc << cmd;
 	startProcess(GroupListing);
 }
@@ -137,7 +177,7 @@
 		if (item->depth() == 0)
 		{ // opening group
 			m_current = item;
-			*m_proc << "nmblookup -M ";
+			*m_proc << "nmblookup"+m_wins_server+"-M ";
                         *m_proc << KProcess::quote(item->text(0));
                         *m_proc << " -S | grep '<20>' | sed -e 's/^[[:space:]]*//' \
                -e 's/[[:space:]]*<20>.*//' | xargs -iserv_name smbclient -N -L \
                'serv_name' -W ";
                         *m_proc << KProcess::quote(item->text(0));
--- branches/KDE/3.5/kdelibs/kdeprint/management/smbview.h #470044:470045
@@ -61,6 +61,7 @@
 	QString		m_buffer;
 	QString		m_login, m_password;
 	KTempFile	*m_passwdFile;
+	QString		m_wins_server;
 };
 
 #endif


[prev in list] [next in list] [prev in thread] [next in thread]