Attachment #1601 for bug #985

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 985
Collapse All | Expand All




#include <tdesu/su.h>
#include "sudlg.h"

TDEsuDialog::TDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,const TQString& icon, int timeout)
     : KPasswordDialog(Password, enableKeep, 0, icon)
{
    TDEConfig* config = TDEGlobal::config();

}


TDEsuDialog::~TDEsuDialog()
{
}

bool TDEsuDialog::checkPassword(const char *password)
{
    SuProcess proc;
    proc.setUser(m_User);

    }
}

void TDEsuDialog::slotUser1()
{
    done(AsUser);
}





#include <kpassdlg.h>

class TDEsuDialog
    : public KPasswordDialog
{
    Q_OBJECT

public:
    TDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep, const TQString& icon, int timeout=-1);
    ~TDEsuDialog();

    enum ResultCodes { AsUser = 10 };
    




    // Stop daemon and exit?
    if (args->isSet("s"))
    {
        TDEsuClient client;
        if (client.ping() == -1)
        {
            kdError(1206) << "Daemon not running -- nothing to stop\n";

    // Check for daemon and start if necessary
    bool just_started = false;
    bool have_daemon = true;
    TDEsuClient client;
    if (!client.isServerSGID())
    {
        kdWarning(1206) << "Daemon not safe (not sgid), not using it.\n";

        TDEStartupInfoData data;
        data.setSilent( TDEStartupInfoData::Yes );
        TDEStartupInfo::sendChange( id, data );
        TDEsuDialog dlg(user, auth_user, keep && !terminal,icon, timeout);
	if (prompt)
	    dlg.addLine(i18n("Command:"), command);
        if ((priority != 50) || (scheduler != SuProcess::SchedNormal))

		dlg.addLine(i18n("Priority:"), prio);
        }
        int ret = dlg.exec();
        if (ret == TDEsuDialog::Rejected)
        {
            TDEStartupInfo::sendFinish( id );
            exit(0);
        }
        if (ret == TDEsuDialog::AsUser)
            change_uid = false;
        password = dlg.password();
        keep = dlg.keep();

Lines 180-186 Link Here

(-)tdebase/tdesu/tdesud/tdesud.cpp (-1 / +1 lines)
180		180
181	if (!access(sock, R_OK\|W_OK))	181	if (!access(sock, R_OK\|W_OK))
182	{	182	{
183	KDEsuClient client;	183	TDEsuClient client;
184	if (client.ping() == -1)	184	if (client.ping() == -1)
185	{	185	{
186	kdWarning(1205) << "stale socket exists\n";	186	kdWarning(1205) << "stale socket exists\n";

Return to bug 985

Lines 14-20 Link Here

(-)tdebase/tdesu/tdesu/sudlg.cpp (-4 / +4 lines)
14	#include <tdesu/su.h>	14	#include <tdesu/su.h>
15	#include "sudlg.h"	15	#include "sudlg.h"
16		16
17	KDEsuDialog::KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,const TQString& icon, int timeout)	17	TDEsuDialog::TDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,const TQString& icon, int timeout)
18	: KPasswordDialog(Password, enableKeep, 0, icon)	18	: KPasswordDialog(Password, enableKeep, 0, icon)
19	{	19	{
20	TDEConfig* config = TDEGlobal::config();	20	TDEConfig* config = TDEGlobal::config();
Lines 45-55 Link Here
45	}	45	}
46		46
47		47
48	KDEsuDialog::~KDEsuDialog()	48	TDEsuDialog::~TDEsuDialog()
49	{	49	{
50	}	50	}
51		51
52	bool KDEsuDialog::checkPassword(const char *password)	52	bool TDEsuDialog::checkPassword(const char *password)
53	{	53	{
54	SuProcess proc;	54	SuProcess proc;
55	proc.setUser(m_User);	55	proc.setUser(m_User);
Lines 91-97 Link Here
91	}	91	}
92	}	92	}
93		93
94	void KDEsuDialog::slotUser1()	94	void TDEsuDialog::slotUser1()
95	{	95	{
96	done(AsUser);	96	done(AsUser);
97	}	97	}

Lines 140-146 Link Here

(-)tdebase/tdesu/tdesu/tdesu.cpp (-5 / +5 lines)
140	// Stop daemon and exit?	140	// Stop daemon and exit?
141	if (args->isSet("s"))	141	if (args->isSet("s"))
142	{	142	{
143	KDEsuClient client;	143	TDEsuClient client;
144	if (client.ping() == -1)	144	if (client.ping() == -1)
145	{	145	{
146	kdError(1206) << "Daemon not running -- nothing to stop\n";	146	kdError(1206) << "Daemon not running -- nothing to stop\n";
Lines 247-253 Link Here
247	// Check for daemon and start if necessary	247	// Check for daemon and start if necessary
248	bool just_started = false;	248	bool just_started = false;
249	bool have_daemon = true;	249	bool have_daemon = true;
250	KDEsuClient client;	250	TDEsuClient client;
251	if (!client.isServerSGID())	251	if (!client.isServerSGID())
252	{	252	{
253	kdWarning(1206) << "Daemon not safe (not sgid), not using it.\n";	253	kdWarning(1206) << "Daemon not safe (not sgid), not using it.\n";
Lines 350-356 Link Here
350	TDEStartupInfoData data;	350	TDEStartupInfoData data;
351	data.setSilent( TDEStartupInfoData::Yes );	351	data.setSilent( TDEStartupInfoData::Yes );
352	TDEStartupInfo::sendChange( id, data );	352	TDEStartupInfo::sendChange( id, data );
353	KDEsuDialog dlg(user, auth_user, keep && !terminal,icon, timeout);	353	TDEsuDialog dlg(user, auth_user, keep && !terminal,icon, timeout);
354	if (prompt)	354	if (prompt)
355	dlg.addLine(i18n("Command:"), command);	355	dlg.addLine(i18n("Command:"), command);
356	if ((priority != 50) \|\| (scheduler != SuProcess::SchedNormal))	356	if ((priority != 50) \|\| (scheduler != SuProcess::SchedNormal))
Lines 363-374 Link Here
363	dlg.addLine(i18n("Priority:"), prio);	363	dlg.addLine(i18n("Priority:"), prio);
364	}	364	}
365	int ret = dlg.exec();	365	int ret = dlg.exec();
366	if (ret == KDEsuDialog::Rejected)	366	if (ret == TDEsuDialog::Rejected)
367	{	367	{
368	TDEStartupInfo::sendFinish( id );	368	TDEStartupInfo::sendFinish( id );
369	exit(0);	369	exit(0);
370	}	370	}
371	if (ret == KDEsuDialog::AsUser)	371	if (ret == TDEsuDialog::AsUser)
372	change_uid = false;	372	change_uid = false;
373	password = dlg.password();	373	password = dlg.password();
374	keep = dlg.keep();	374	keep = dlg.keep();

Lines 9-22 Link Here

(-)tdebase/tdesu/tdesu/sudlg.h (-3 / +3 lines)
9		9
10	#include <kpassdlg.h>	10	#include <kpassdlg.h>
11		11
12	class KDEsuDialog	12	class TDEsuDialog
13	: public KPasswordDialog	13	: public KPasswordDialog
14	{	14	{
15	Q_OBJECT	15	Q_OBJECT
16		16
17	public:	17	public:
18	KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep, const TQString& icon, int timeout=-1);	18	TDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep, const TQString& icon, int timeout=-1);
19	~KDEsuDialog();	19	~TDEsuDialog();
20		20
21	enum ResultCodes { AsUser = 10 };	21	enum ResultCodes { AsUser = 10 };
22		22