svn commit: samba r9272 - branches/SAMBA_3_0/source/utils
trunk/source/utils
tpot at samba.org
tpot at samba.org
Fri Aug 12 20:58:56 GMT 2005
Author: tpot
Date: 2005-08-12 20:58:56 +0000 (Fri, 12 Aug 2005)
New Revision: 9272
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9272
Log:
Patch for fixing unused variables warning from Jason Mader. Fixes
bugzilla #2984.
Modified:
branches/SAMBA_3_0/source/utils/pdbedit.c
trunk/source/utils/pdbedit.c
Changeset:
Modified: branches/SAMBA_3_0/source/utils/pdbedit.c
===================================================================
--- branches/SAMBA_3_0/source/utils/pdbedit.c 2005-08-12 20:12:31 UTC (rev 9271)
+++ branches/SAMBA_3_0/source/utils/pdbedit.c 2005-08-12 20:58:56 UTC (rev 9272)
@@ -235,7 +235,7 @@
static int print_users_list (struct pdb_context *in, BOOL verbosity, BOOL smbpwdstyle)
{
SAM_ACCOUNT *sam_pwent=NULL;
- BOOL check, ret;
+ BOOL check;
check = NT_STATUS_IS_OK(in->pdb_setsampwent(in, False, 0));
if (!check) {
@@ -245,7 +245,7 @@
check = True;
if (!(NT_STATUS_IS_OK(pdb_init_sam(&sam_pwent)))) return 1;
- while (check && (ret = NT_STATUS_IS_OK(in->pdb_getsampwent (in, sam_pwent)))) {
+ while (check && NT_STATUS_IS_OK(in->pdb_getsampwent (in, sam_pwent))) {
if (verbosity)
printf ("---------------\n");
print_sam_info (sam_pwent, verbosity, smbpwdstyle);
@@ -264,7 +264,7 @@
static int fix_users_list (struct pdb_context *in)
{
SAM_ACCOUNT *sam_pwent=NULL;
- BOOL check, ret;
+ BOOL check;
check = NT_STATUS_IS_OK(in->pdb_setsampwent(in, False, 0));
if (!check) {
@@ -274,7 +274,7 @@
check = True;
if (!(NT_STATUS_IS_OK(pdb_init_sam(&sam_pwent)))) return 1;
- while (check && (ret = NT_STATUS_IS_OK(in->pdb_getsampwent (in, sam_pwent)))) {
+ while (check && NT_STATUS_IS_OK(in->pdb_getsampwent (in, sam_pwent))) {
printf("Updating record for user %s\n", pdb_get_username(sam_pwent));
if (!pdb_update_sam_account(sam_pwent)) {
@@ -430,12 +430,12 @@
const char *profile, char *user_sid, char *group_sid)
{
SAM_ACCOUNT *sam_pwent=NULL;
- NTSTATUS nt_status;
+
char *password1, *password2, *staticpass;
get_global_sam_sid();
- if (!NT_STATUS_IS_OK(nt_status = pdb_init_sam_new(&sam_pwent, username, 0))) {
+ if (!NT_STATUS_IS_OK(pdb_init_sam_new(&sam_pwent, username, 0))) {
DEBUG(0, ("could not create account to add new user %s\n", username));
return -1;
}
Modified: trunk/source/utils/pdbedit.c
===================================================================
--- trunk/source/utils/pdbedit.c 2005-08-12 20:12:31 UTC (rev 9271)
+++ trunk/source/utils/pdbedit.c 2005-08-12 20:58:56 UTC (rev 9272)
@@ -256,7 +256,7 @@
static int print_users_list (struct pdb_context *in, BOOL verbosity, BOOL smbpwdstyle)
{
SAM_ACCOUNT *sam_pwent=NULL;
- BOOL check, ret;
+ BOOL check;
check = NT_STATUS_IS_OK(in->pdb_setsampwent(in, False, 0));
if (!check) {
@@ -266,7 +266,7 @@
check = True;
if (!(NT_STATUS_IS_OK(pdb_init_sam(&sam_pwent)))) return 1;
- while (check && (ret = NT_STATUS_IS_OK(in->pdb_getsampwent (in, sam_pwent)))) {
+ while (check && NT_STATUS_IS_OK(in->pdb_getsampwent (in, sam_pwent))) {
if (verbosity)
printf ("---------------\n");
print_sam_info (sam_pwent, verbosity, smbpwdstyle);
@@ -285,7 +285,7 @@
static int fix_users_list (struct pdb_context *in)
{
SAM_ACCOUNT *sam_pwent=NULL;
- BOOL check, ret;
+ BOOL check;
check = NT_STATUS_IS_OK(in->pdb_setsampwent(in, False, 0));
if (!check) {
@@ -295,7 +295,7 @@
check = True;
if (!(NT_STATUS_IS_OK(pdb_init_sam(&sam_pwent)))) return 1;
- while (check && (ret = NT_STATUS_IS_OK(in->pdb_getsampwent (in, sam_pwent)))) {
+ while (check && NT_STATUS_IS_OK(in->pdb_getsampwent (in, sam_pwent))) {
printf("Updating record for user %s\n", pdb_get_username(sam_pwent));
if (!pdb_update_sam_account(sam_pwent)) {
@@ -451,12 +451,12 @@
const char *profile, char *user_sid, char *group_sid)
{
SAM_ACCOUNT *sam_pwent=NULL;
- NTSTATUS nt_status;
+
char *password1, *password2, *staticpass;
get_global_sam_sid();
- if (!NT_STATUS_IS_OK(nt_status = pdb_init_sam_new(&sam_pwent, username, 0))) {
+ if (!NT_STATUS_IS_OK(pdb_init_sam_new(&sam_pwent, username, 0))) {
DEBUG(0, ("could not create account to add new user %s\n", username));
return -1;
}
More information about the samba-cvs
mailing list