diff options
author | Robert Xu <rxu@linux-zdwj.site> | 2012-02-01 00:31:59 -0500 |
---|---|---|
committer | Robert Xu <rxu@linux-zdwj.site> | 2012-02-01 00:31:59 -0500 |
commit | f599f39717d771b8b7a2aff006cda6c31e8b12da (patch) | |
tree | f601e3c0303a193cda6f8c6f956619dda9673c70 /opensuse/core/tdelibs/fix-kerberos-printing.diff | |
parent | ead369ac94473139a2320a1c90cda64dd887b94a (diff) | |
parent | 27c9e783c6283f8916ebee3a23c6d1ba909a5126 (diff) | |
download | tde-packaging-f599f39717d771b8b7a2aff006cda6c31e8b12da.tar.gz tde-packaging-f599f39717d771b8b7a2aff006cda6c31e8b12da.zip |
Merge branch 'suse'
Diffstat (limited to 'opensuse/core/tdelibs/fix-kerberos-printing.diff')
-rw-r--r-- | opensuse/core/tdelibs/fix-kerberos-printing.diff | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/opensuse/core/tdelibs/fix-kerberos-printing.diff b/opensuse/core/tdelibs/fix-kerberos-printing.diff new file mode 100644 index 000000000..0276cdd06 --- /dev/null +++ b/opensuse/core/tdelibs/fix-kerberos-printing.diff @@ -0,0 +1,37 @@ +Index: kdeprint/management/smbview.cpp +=================================================================== +--- kdeprint/management/smbview.cpp.orig ++++ kdeprint/management/smbview.cpp +@@ -187,13 +187,26 @@ void SmbView::setOpen(QListViewItem *ite + } + else if (item->depth() == 1) + { // opening server ++ char *krb5ccname = getenv ("KRB5CCNAME"); + m_current = item; +- *m_proc << "smbclient -N -L "; +- *m_proc << KProcess::quote(item->text(0)); +- *m_proc << " -W "; +- *m_proc << KProcess::quote(item->parent()->text(0)); +- *m_proc << " -A "; +- *m_proc << KProcess::quote(m_passwdFile->name()); ++ if (krb5ccname) ++ { ++ *m_proc << "smbclient -k -N -L "; ++ } ++ else ++ { ++ *m_proc << "smbclient -N -L "; ++ } ++ *m_proc << KProcess::quote (item->text (0)); ++ *m_proc << " -W "; ++ *m_proc << KProcess::quote (item->parent ()-> ++ text (0)); ++ if (!krb5ccname) ++ { ++ *m_proc << " -A "; ++ *m_proc << KProcess:: ++ quote (m_passwdFile->name ()); ++ } + startProcess(ShareListing); + } + } |