sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-08 04:58:40 +03:00
Code

you know, when you do a cvs commit, you _really_ expect it to actually work.

Browse Source 
this explains why j-f wasn't happy.
This commit is contained in:
Luke Leighton -
parent 87da4404ab
commit c51e38214a
3 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/include/rpc_spoolss.h
View File

@ -1607,15 +1607,18 @@ typedef struct pjob_info_info
JOB_INFO_1 *job_info_1;
JOB_INFO_2 *job_info_2;
void *info;
} job;
}
job;
} PJOB_INFO;
}
PJOB_INFO;
typedef struct spool_r_getjob
{
NEW_BUFFER *buffer;
uint32 needed;
uint32 status;
}
SPOOL_R_GETJOB;

51
source/include/smb.h
View File

@ -2,10 +2,10 @@
Unix SMB/Netbios implementation.
Version 1.9.
SMB parameters and setup
Copyright (C) Andrew Tridgell 1992-1998
Copyright (C) John H Terpstra 1996-1998
Copyright (C) Luke Kenneth Casson Leighton 1996-1998
Copyright (C) Paul Ashton 1998
Copyright (C) Andrew Tridgell 1992-2000
Copyright (C) John H Terpstra 1996-2000
Copyright (C) Luke Kenneth Casson Leighton 1996-2000
Copyright (C) Paul Ashton 1998-2000
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -618,33 +618,43 @@ struct dcinfo
uchar md4pw[16]; /* md4(machine password) */
};
#include "nt_printing.h"
#include "ntdomain.h"
typedef struct
{
uid_t uid; /* uid of a validated user */
gid_t gid; /* gid of a validated user */
uid_t uid; /* uid of a validated user */
gid_t gid; /* gid of a validated user */
fstring requested_name; /* user name from the client */
fstring name; /* unix user name of a validated user */
fstring real_name; /* to store real name from password file - simeon */
BOOL guest;
fstring requested_name; /* user name from the client */
fstring name; /* unix user name of a validated user */
fstring real_name; /* to store real name from password file - simeon */
BOOL guest;
/* following groups stuff added by ih */
/* This groups info is needed for when we become_user() for this uid */
int n_groups;
gid_t *groups;
/* following groups stuff added by ih */
/* This groups info is needed for when we become_user() for this uid */
int n_groups;
gid_t *groups;
int n_sids;
int *sids;
/* per-user authentication information on NT RPCs */
/* lkclXXXX - THIS SHOULD NOT BE HERE! */
struct dcinfo dc;
/* per-user authentication information on NT RPCs */
struct dcinfo dc;
NET_USER_INFO_3 usr;
} user_struct;
typedef struct
{
uint32 pid;
uint16 vuid;
} vuser_key;
enum {LPQ_QUEUED,LPQ_PAUSED,LPQ_SPOOLING,LPQ_PRINTING};
typedef struct
typedef struct _print_queue_struct
{
int job;
int size;
@ -1636,9 +1646,6 @@ extern int chain_size;
#include "smb_macros.h"
#include "nt_printing.h"
#include "ntdomain.h"
/* A netbios name structure. */
struct nmb_name {
char name[17];

9
source/smbd/password.c
View File

@ -122,18 +122,12 @@ void invalidate_vuid(uint16 vuid)
vuser->uid = (uid_t)-1;
vuser->gid = (gid_t)-1;
vuser->n_sids = 0;
/* same number of igroups as groups */
vuser->n_groups = 0;
if (vuser->groups)
free((char *)vuser->groups);
if (vuser->sids)
free((char *)vuser->sids);
vuser->sids = NULL;
vuser->groups = NULL;
}
@ -255,9 +249,6 @@ uint16 register_vuid(uid_t uid,gid_t gid, char *unix_name, char *requested_name,
fstrcpy(vuser->name,unix_name);
fstrcpy(vuser->requested_name,requested_name);
vuser->n_sids = 0;
vuser->sids = NULL;
vuser->n_groups = 0;
vuser->groups = NULL;