Headers diff for netapi32.dll between 6.0.6002.18005-Windows 6.0 and 6.1.7601.17887-Windows 7.0 versions

dsgetdc.h (6.0.6002.18005-Windows 6.0)		dsgetdc.h (6.1.7601.17887-Windows 7.0)

skipping to change at line 69		skipping to change at line 69
#define DS_AVOID_SELF 0x00004000		#define DS_AVOID_SELF 0x00004000
#define DS_ONLY_LDAP_NEEDED 0x00008000		#define DS_ONLY_LDAP_NEEDED 0x00008000

#define DS_IS_FLAT_NAME 0x00010000		#define DS_IS_FLAT_NAME 0x00010000
#define DS_IS_DNS_NAME 0x00020000		#define DS_IS_DNS_NAME 0x00020000

#define DS_TRY_NEXTCLOSEST_SITE 0x00040000		#define DS_TRY_NEXTCLOSEST_SITE 0x00040000

#define DS_DIRECTORY_SERVICE_6_REQUIRED 0x00080000		#define DS_DIRECTORY_SERVICE_6_REQUIRED 0x00080000


		#define DS_WEB_SERVICE_REQUIRED 0x00100000

#define DS_RETURN_DNS_NAME 0x40000000		#define DS_RETURN_DNS_NAME 0x40000000
#define DS_RETURN_FLAT_NAME 0x80000000		#define DS_RETURN_FLAT_NAME 0x80000000

#define DSGETDC_VALID_FLAGS ( \		#define DSGETDC_VALID_FLAGS ( \
DS_FORCE_REDISCOVERY \| \		DS_FORCE_REDISCOVERY \| \
DS_DIRECTORY_SERVICE_REQUIRED \| \		DS_DIRECTORY_SERVICE_REQUIRED \| \
DS_DIRECTORY_SERVICE_PREFERRED \| \		DS_DIRECTORY_SERVICE_PREFERRED \| \
DS_GC_SERVER_REQUIRED \| \		DS_GC_SERVER_REQUIRED \| \
DS_PDC_REQUIRED \| \		DS_PDC_REQUIRED \| \
DS_BACKGROUND_ONLY \| \		DS_BACKGROUND_ONLY \| \

skipping to change at line 90		skipping to change at line 92
DS_KDC_REQUIRED \| \		DS_KDC_REQUIRED \| \
DS_TIMESERV_REQUIRED \| \		DS_TIMESERV_REQUIRED \| \
DS_WRITABLE_REQUIRED \| \		DS_WRITABLE_REQUIRED \| \
DS_GOOD_TIMESERV_PREFERRED \| \		DS_GOOD_TIMESERV_PREFERRED \| \
DS_AVOID_SELF \| \		DS_AVOID_SELF \| \
DS_ONLY_LDAP_NEEDED \| \		DS_ONLY_LDAP_NEEDED \| \
DS_IS_FLAT_NAME \| \		DS_IS_FLAT_NAME \| \
DS_IS_DNS_NAME \| \		DS_IS_DNS_NAME \| \
DS_TRY_NEXTCLOSEST_SITE \| \		DS_TRY_NEXTCLOSEST_SITE \| \
DS_DIRECTORY_SERVICE_6_REQUIRED \| \		DS_DIRECTORY_SERVICE_6_REQUIRED \| \

		DS_WEB_SERVICE_REQUIRED \| \
DS_RETURN_FLAT_NAME \| \		DS_RETURN_FLAT_NAME \| \
DS_RETURN_DNS_NAME )		DS_RETURN_DNS_NAME )

//		//
// Structure returned from DsGetDcName		// Structure returned from DsGetDcName
//		//

typedef struct _DOMAIN_CONTROLLER_INFOA {		typedef struct _DOMAIN_CONTROLLER_INFOA {
LPSTR DomainControllerName;		LPSTR DomainControllerName;
LPSTR DomainControllerAddress;		LPSTR DomainControllerAddress;

skipping to change at line 176		skipping to change at line 179
#define DS_LDAP_FLAG 0x00000008 // Server supports an LDAP server		#define DS_LDAP_FLAG 0x00000008 // Server supports an LDAP server
#define DS_DS_FLAG 0x00000010 // DC supports a DS and is a Domain Controller		#define DS_DS_FLAG 0x00000010 // DC supports a DS and is a Domain Controller
#define DS_KDC_FLAG 0x00000020 // DC is running KDC service		#define DS_KDC_FLAG 0x00000020 // DC is running KDC service
#define DS_TIMESERV_FLAG 0x00000040 // DC is running time service		#define DS_TIMESERV_FLAG 0x00000040 // DC is running time service
#define DS_CLOSEST_FLAG 0x00000080 // DC is in closest site to client		#define DS_CLOSEST_FLAG 0x00000080 // DC is in closest site to client
#define DS_WRITABLE_FLAG 0x00000100 // DC has a writable DS		#define DS_WRITABLE_FLAG 0x00000100 // DC has a writable DS
#define DS_GOOD_TIMESERV_FLAG 0x00000200 // DC is running time service (and has clock hardware)		#define DS_GOOD_TIMESERV_FLAG 0x00000200 // DC is running time service (and has clock hardware)
#define DS_NDNC_FLAG 0x00000400 // DomainName is non-domain NC serv iced by the LDAP server		#define DS_NDNC_FLAG 0x00000400 // DomainName is non-domain NC serv iced by the LDAP server
#define DS_SELECT_SECRET_DOMAIN_6_FLAG 0x00000800 // DC has some secrets		#define DS_SELECT_SECRET_DOMAIN_6_FLAG 0x00000800 // DC has some secrets
#define DS_FULL_SECRET_DOMAIN_6_FLAG 0x00001000 // DC has all secrets		#define DS_FULL_SECRET_DOMAIN_6_FLAG 0x00001000 // DC has all secrets

		#define DS_WS_FLAG 0x00002000 // DC is running web service
#define DS_PING_FLAGS 0x000FFFFF // Flags returned on ping		#define DS_PING_FLAGS 0x000FFFFF // Flags returned on ping

#define DS_DNS_CONTROLLER_FLAG 0x20000000 // DomainControllerName is a DNS na me		#define DS_DNS_CONTROLLER_FLAG 0x20000000 // DomainControllerName is a DNS na me
#define DS_DNS_DOMAIN_FLAG 0x40000000 // DomainName is a DNS name		#define DS_DNS_DOMAIN_FLAG 0x40000000 // DomainName is a DNS name
#define DS_DNS_FOREST_FLAG 0x80000000 // DnsForestName is a DNS name		#define DS_DNS_FOREST_FLAG 0x80000000 // DnsForestName is a DNS name

//		//
// Function Prototypes		// Function Prototypes
//		//


End of changes. 3 change blocks.
0 lines changed or deleted		4 lines changed or added

lmaccess.h (6.0.6002.18005-Windows 6.0)		lmaccess.h (6.1.7601.17887-Windows 7.0)

skipping to change at line 1149		skipping to change at line 1149
//		//
// Access Class		// Access Class
//		//

#ifndef _LMACCESS_		#ifndef _LMACCESS_
#define _LMACCESS_		#define _LMACCESS_

//		//
// Function Prototypes - Access		// Function Prototypes - Access
//		//

//
// The NetAccess APIs are only available to downlevel
//

#define NetAccessAdd RxNetAccessAdd

NET_API_STATUS NET_API_FUNCTION		NET_API_STATUS NET_API_FUNCTION
NetAccessAdd (		NetAccessAdd (
IN LPCWSTR servername OPTIONAL,		IN LPCWSTR servername OPTIONAL,
IN DWORD level,		IN DWORD level,
IN LPBYTE buf,		IN LPBYTE buf,
OUT LPDWORD parm_err OPTIONAL		OUT LPDWORD parm_err OPTIONAL
);		);


#define NetAccessEnum RxNetAccessEnum

NET_API_STATUS NET_API_FUNCTION		NET_API_STATUS NET_API_FUNCTION
NetAccessEnum (		NetAccessEnum (
IN LPCWSTR servername OPTIONAL,		IN LPCWSTR servername OPTIONAL,
IN LPCWSTR BasePath,		IN LPCWSTR BasePath,
IN DWORD Recursive,		IN DWORD Recursive,
IN DWORD level,		IN DWORD level,
OUT LPBYTE *bufptr,		OUT LPBYTE *bufptr,
IN DWORD prefmaxlen,		IN DWORD prefmaxlen,
OUT LPDWORD entriesread,		OUT LPDWORD entriesread,
OUT LPDWORD totalentries,		OUT LPDWORD totalentries,
IN OUT LPDWORD resume_handle OPTIONAL		IN OUT LPDWORD resume_handle OPTIONAL
);		);


#define NetAccessGetInfo RxNetAccessGetInfo

NET_API_STATUS NET_API_FUNCTION		NET_API_STATUS NET_API_FUNCTION
NetAccessGetInfo (		NetAccessGetInfo (
IN LPCWSTR servername OPTIONAL,		IN LPCWSTR servername OPTIONAL,
IN LPCWSTR resource,		IN LPCWSTR resource,
IN DWORD level,		IN DWORD level,
OUT LPBYTE *bufptr		OUT LPBYTE *bufptr
);		);


#define NetAccessSetInfo RxNetAccessSetInfo

NET_API_STATUS NET_API_FUNCTION		NET_API_STATUS NET_API_FUNCTION
NetAccessSetInfo (		NetAccessSetInfo (
IN LPCWSTR servername OPTIONAL,		IN LPCWSTR servername OPTIONAL,
IN LPCWSTR resource,		IN LPCWSTR resource,
IN DWORD level,		IN DWORD level,
IN LPBYTE buf,		IN LPBYTE buf,
OUT LPDWORD parm_err OPTIONAL		OUT LPDWORD parm_err OPTIONAL
);		);


#define NetAccessDel RxNetAccessDel

NET_API_STATUS NET_API_FUNCTION		NET_API_STATUS NET_API_FUNCTION
NetAccessDel (		NetAccessDel (
IN LPCWSTR servername OPTIONAL,		IN LPCWSTR servername OPTIONAL,
IN LPCWSTR resource		IN LPCWSTR resource
);		);


#define NetAccessGetUserPerms RxNetAccessGetUserPerms

NET_API_STATUS NET_API_FUNCTION		NET_API_STATUS NET_API_FUNCTION
NetAccessGetUserPerms (		NetAccessGetUserPerms (
IN LPCWSTR servername OPTIONAL,		IN LPCWSTR servername OPTIONAL,
IN LPCWSTR UGname,		IN LPCWSTR UGname,
IN LPCWSTR resource,		IN LPCWSTR resource,
OUT LPDWORD Perms		OUT LPDWORD Perms
);		);

//		//
// Data Structures - Access		// Data Structures - Access

skipping to change at line 1618		skipping to change at line 1603

#define NETLOGON_REPLICATION_NEEDED 0x01 // Database is out of date		#define NETLOGON_REPLICATION_NEEDED 0x01 // Database is out of date
#define NETLOGON_REPLICATION_IN_PROGRESS 0x02 // Replication is happening now		#define NETLOGON_REPLICATION_IN_PROGRESS 0x02 // Replication is happening now
#define NETLOGON_FULL_SYNC_REPLICATION 0x04 // full sync replication require d/progress		#define NETLOGON_FULL_SYNC_REPLICATION 0x04 // full sync replication require d/progress
#define NETLOGON_REDO_NEEDED 0x08 // Redo of previous replication needed		#define NETLOGON_REDO_NEEDED 0x08 // Redo of previous replication needed
#define NETLOGON_HAS_IP 0x10 // The trusted domain DC has an IP address		#define NETLOGON_HAS_IP 0x10 // The trusted domain DC has an IP address
#define NETLOGON_HAS_TIMESERV 0x20 // The trusted domain DC runs th e Windows Time Service		#define NETLOGON_HAS_TIMESERV 0x20 // The trusted domain DC runs th e Windows Time Service
#define NETLOGON_DNS_UPDATE_FAILURE 0x40 // There was a failure in the la st update for one of the DNS records		#define NETLOGON_DNS_UPDATE_FAILURE 0x40 // There was a failure in the la st update for one of the DNS records
#define NETLOGON_VERIFY_STATUS_RETURNED 0x80 // Trust verification status ret urned in netlog2_pdc_connection_status		#define NETLOGON_VERIFY_STATUS_RETURNED 0x80 // Trust verification status ret urned in netlog2_pdc_connection_status


		#define SERVICE_ACCOUNT_PASSWORD TEXT("_SA_{262E99C9-6160-4871-ACEC-4E61736B6F21
		}")
		#define SERVICE_ACCOUNT_SECRET_PREFIX TEXT("_SC_{262E99C9-6160-4871-ACEC-4E61736
		B6F21}_")

		DEFINE_GUID( //262e99c9-6160-4871-acec-4e61736b6f21
		ServiceAccountPasswordGUID,
		0x262E99C9,
		0x6160,
		0x4871,
		0xAC, 0xEC, 0x4E, 0x61, 0x73, 0x6B, 0x6F, 0x21 );

		NTSTATUS
		NetAddServiceAccount(
		__in_opt LPWSTR ServerName,
		__in LPWSTR AccountName,
		__in LPWSTR Reserved,
		__in DWORD Flags);

		// Do not create an account by this name
		// Only link this account to my computer if it exists
		#define SERVICE_ACCOUNT_FLAG_LINK_TO_HOST_ONLY 0x00000001L

		// Do not delete the service account object from AD
		// Simply unlink it from this computer and delete the local secret
		#define SERVICE_ACCOUNT_FLAG_UNLINK_FROM_HOST_ONLY 0x00000001L

		NTSTATUS
		NetRemoveServiceAccount(
		__in_opt LPWSTR ServerName,
		__in LPWSTR AccountName,
		__in DWORD Flags);

		NTSTATUS
		NetEnumerateServiceAccounts(
		__in_opt LPWSTR ServerName,
		__in DWORD Flags,
		__out DWORD* AccountsCount,
		__deref_out_ecount(AccountsCount) PZPWSTR Accounts);

		NTSTATUS
		NetIsServiceAccount(
		__in_opt LPWSTR ServerName,
		__in LPWSTR AccountName,
		__out BOOL *IsService);

		NTSTATUS
		NetQueryServiceAccount(
		__in_opt LPWSTR ServerName,
		__in LPWSTR AccountName,
		__in DWORD InfoLevel,
		__deref_out PBYTE* Buffer);

		//
		// Data Structures - Service
		//

		typedef enum _MSA_INFO_LEVEL {
		MsaInfoLevel0 = 0,
		MsaInfoLevelMax
		} MSA_INFO_LEVEL, *PMSA_INFO_LEVEL;

		typedef enum _MSA_INFO_STATE {
		MsaInfoNotExist = 1,
		MsaInfoNotService,
		MsaInfoCannotInstall,
		MsaInfoCanInstall,
		MsaInfoInstalled
		}MSA_INFO_STATE, *PMSA_INFO_STATE;

		typedef struct _MSA_INFO_0 {
		MSA_INFO_STATE State;
		}MSA_INFO_0, PMSA_INFO_0, LPMSA_INFO_0;

#ifdef __cplusplus		#ifdef __cplusplus
}		}
#endif		#endif

#endif // _LMDOMAIN_		#endif // _LMDOMAIN_

End of changes. 7 change blocks.
15 lines changed or deleted		74 lines changed or added

lmconfig.h (6.0.6002.18005-Windows 6.0)		lmconfig.h (6.1.7601.17887-Windows 7.0)

skipping to change at line 79		skipping to change at line 79
NetConfigSet (		NetConfigSet (
IN LPCWSTR server OPTIONAL,		IN LPCWSTR server OPTIONAL,
IN LPCWSTR reserved1 OPTIONAL,		IN LPCWSTR reserved1 OPTIONAL,
IN LPCWSTR component,		IN LPCWSTR component,
IN DWORD level,		IN DWORD level,
IN DWORD reserved2,		IN DWORD reserved2,
IN LPBYTE buf,		IN LPBYTE buf,
IN DWORD reserved3		IN DWORD reserved3
);		);


NET_API_STATUS NET_API_FUNCTION
NetRegisterDomainNameChangeNotification(
PHANDLE NotificationEventHandle
);

NET_API_STATUS NET_API_FUNCTION
NetUnregisterDomainNameChangeNotification(
HANDLE NotificationEventHandle
);

//		//
// Data Structures - Config		// Data Structures - Config
//		//

typedef struct _CONFIG_INFO_0 {		typedef struct _CONFIG_INFO_0 {
LPWSTR cfgi0_key;		LPWSTR cfgi0_key;
LPWSTR cfgi0_data;		LPWSTR cfgi0_data;
} CONFIG_INFO_0, PCONFIG_INFO_0, LPCONFIG_INFO_0;		} CONFIG_INFO_0, PCONFIG_INFO_0, LPCONFIG_INFO_0;

#ifdef __cplusplus		#ifdef __cplusplus

End of changes. 1 change blocks.
10 lines changed or deleted		0 lines changed or added

lmdfs.h (6.0.6002.18005-Windows 6.0)		lmdfs.h (6.1.7601.17887-Windows 7.0)

skipping to change at line 55		skipping to change at line 55

//		//
// These are valid for setting the volume state on the root		// These are valid for setting the volume state on the root
// These are available to force a resynchronize on the root		// These are available to force a resynchronize on the root
// volume or to put it in a standby mode.		// volume or to put it in a standby mode.
//		//
#define DFS_VOLUME_STATE_RESYNCHRONIZE 0x10		#define DFS_VOLUME_STATE_RESYNCHRONIZE 0x10
#define DFS_VOLUME_STATE_STANDBY 0x20		#define DFS_VOLUME_STATE_STANDBY 0x20

//		//

		// When supported by a DFS namespace, the local state on
		// the DFS root target is refreshed with information from
		// the master state in the DFS metadata forcibly.
		//

		#define DFS_VOLUME_STATE_FORCE_SYNC 0x40

		//
// These are valid on getting the volume state on the root		// These are valid on getting the volume state on the root
// These are available to determine the flavor of DFS		// These are available to determine the flavor of DFS
// A few bits are reserved to determine the flavor of the DFS root.		// A few bits are reserved to determine the flavor of the DFS root.
// To get the flavor, and the state with DFS_VOLUME_FLAVORS.		// To get the flavor, and the state with DFS_VOLUME_FLAVORS.
//		//
// (_state & DFS_VOLUME_FLAVORS) will tell you the flavor of the dfs root.		// (_state & DFS_VOLUME_FLAVORS) will tell you the flavor of the dfs root.
//		//
//		//

#define DFS_VOLUME_FLAVORS 0x0300		#define DFS_VOLUME_FLAVORS 0x0300

skipping to change at line 326		skipping to change at line 334

//		//
// Level 7:		// Level 7:
//		//
typedef struct _DFS_INFO_7 {		typedef struct _DFS_INFO_7 {
GUID GenerationGuid; // Guid representation of the version/genera tion		GUID GenerationGuid; // Guid representation of the version/genera tion
// number of the DFS root.		// number of the DFS root.
} DFS_INFO_7, PDFS_INFO_7, LPDFS_INFO_7;		} DFS_INFO_7, PDFS_INFO_7, LPDFS_INFO_7;

//		//

// The PropertyFlags field of DFS_INFO_5, DFS_INFO_6 and DFS_INFO_103.		// Level 8:
		//
		typedef struct _DFS_INFO_8 {
		LPWSTR EntryPath; // Name of DFS namespace, DFS root name.
		LPWSTR Comment; // Comment for root/link.
		DWORD State; // State of the root/link, one of DFS_VOLUME
		_STATE_*
		// Also has DFS_VOLUME_FLAVOR_* informa
		tion.
		ULONG Timeout; // Referral TTL, in seconds, of root/link.
		GUID Guid; // GUID of this root/link.
		ULONG PropertyFlags; // Properties of root/link. One of DFS_PROPE
		RTY_FLAG_*
		ULONG MetadataSize; // Size of Active Directory BLOB for a domai
		n-based
		// DFS namespace; size of metadata stor
		ed in registry
		// for stand-alone DFS. Valid for DFS r
		oots only.
		#ifdef MIDL_PASS

		//
		// For use by the RPC marshalling code only.
		//

		ULONG SecurityDescriptorLength;

		//
		// Self-relative security descriptor to be associated
		// with DFS link (and stamped on the reparse-point
		// on disk).
		//

		[size_is(SecurityDescriptorLength)] PUCHAR pSecurityDescriptor;
		#else
		ULONG SdLengthReserved;
		PSECURITY_DESCRIPTOR pSecurityDescriptor;
		#endif
		DWORD NumberOfStorages; // Number of storage servers for this volume
		} DFS_INFO_8, PDFS_INFO_8, LPDFS_INFO_8;

		//
		// Level 9:
		//
		typedef struct _DFS_INFO_9 {
		LPWSTR EntryPath; // Name of DFS namespace, DFS root name.
		LPWSTR Comment; // Comment for root/link.
		DWORD State; // State of the root/link, one of DFS_VOLUME
		_STATE_*
		// Also has DFS_VOLUME_FLAVOR_* informa
		tion.
		ULONG Timeout; // Referral TTL, in seconds, of root/link.
		GUID Guid; // GUID of this root/link.
		ULONG PropertyFlags; // Properties of root/link. One of DFS_PROPE
		RTY_FLAG_*
		ULONG MetadataSize; // Size of Active Directory BLOB for a domai
		n-based
		// DFS namespace; size of metadata stor
		ed in registry
		// for stand-alone DFS. Valid for DFS r
		oots only.
		#ifdef MIDL_PASS

		//
		// For use by the RPC marshalling code only.
		//

		ULONG SecurityDescriptorLength;

		//
		// Self-relative security descriptor to be associated
		// with DFS link (and stamped on the reparse-point
		// on disk).
		//

		[size_is(SecurityDescriptorLength)] PUCHAR pSecurityDescriptor;
		#else
		ULONG SdLengthReserved;
		PSECURITY_DESCRIPTOR pSecurityDescriptor;
		#endif
		DWORD NumberOfStorages; // Number of targets for this root/link.
		#ifdef MIDL_PASS
		[size_is(NumberOfStorages)] LPDFS_STORAGE_INFO_1 Storage;
		#else
		LPDFS_STORAGE_INFO_1 Storage; // An array (of NumberOfStorages element
		s) of
		// storage-specific information.
		#endif // MIDL_PASS
		} DFS_INFO_9, PDFS_INFO_9, LPDFS_INFO_9;

//		//

		// The PropertyFlags field of DFS_INFO_5, DFS_INFO_6,
		// DFS_INFO_103, DFS_INFO_105 & DFS_INFO_107.
		//

		#define DFS_VALID_PROPERTY_FLAGS (DFS_PROPERTY_FLAG_INSITE_REFERRALS \| \
		DFS_PROPERTY_FLAG_ROOT_SCALABILITY \| \
		DFS_PROPERTY_FLAG_SITE_COSTING \| \
		DFS_PROPERTY_FLAG_TARGET_FAILBACK \| \
		DFS_PROPERTY_FLAG_CLUSTER_ENABLED \| \
		DFS_PROPERTY_FLAG_ABDE)

//		//
// The "insite" flag. When set, only targets in the same		// The "insite" flag. When set, only targets in the same
// site as the client are returned.		// site as the client are returned.
//		//
// Valid for domain/standalone roots/links		// Valid for domain/standalone roots/links
//		//

#define DFS_PROPERTY_FLAG_INSITE_REFERRALS 0x00000001		#define DFS_PROPERTY_FLAG_INSITE_REFERRALS 0x00000001


skipping to change at line 374		skipping to change at line 468
#define DFS_PROPERTY_FLAG_TARGET_FAILBACK 0x00000008		#define DFS_PROPERTY_FLAG_TARGET_FAILBACK 0x00000008

//		//
// Bit will be 1 if the DFS root is clustered. Cannot be set		// Bit will be 1 if the DFS root is clustered. Cannot be set
// using the NetDfsSetInfo() API.		// using the NetDfsSetInfo() API.
//		//

#define DFS_PROPERTY_FLAG_CLUSTER_ENABLED 0x00000010		#define DFS_PROPERTY_FLAG_CLUSTER_ENABLED 0x00000010

//		//

		// When set by the caller, Access-Based Directory Enumeration support
		// is enabled on all the DFS root target share of the DFS namespace.
		// Valid only for DFS namespaces which support the capability
		// DFS_NAMESPACE_CAPABILITY_ABDE. Valid only on the DFS namespace root
		// and not on root targets, link or link targets.
		// This property must be enabled to associate security descriptor
		// with a DFS link.
		//

		#define DFS_PROPERTY_FLAG_ABDE 0x00000020

		//
		// Level 50:
		//

		//
		// DFS metadata version and capabilities of an existing
		// DFS namespace.
		//

		typedef struct _DFS_INFO_50 {
		ULONG NamespaceMajorVersion;
		ULONG NamespaceMinorVersion;
		ULONGLONG NamespaceCapabilities;
		} DFS_INFO_50, PDFS_INFO_50, LPDFS_INFO_50;

		//
// Level 100:		// Level 100:
//		//
typedef struct _DFS_INFO_100 {		typedef struct _DFS_INFO_100 {
LPWSTR Comment; // Comment for this volume or storage		LPWSTR Comment; // Comment for this volume or storage
} DFS_INFO_100, PDFS_INFO_100, LPDFS_INFO_100;		} DFS_INFO_100, PDFS_INFO_100, LPDFS_INFO_100;

//		//
// Level 101:		// Level 101:
//		//
typedef struct _DFS_INFO_101 {		typedef struct _DFS_INFO_101 {

skipping to change at line 432		skipping to change at line 553
//		//
// Level 106:		// Level 106:
//		//
typedef struct _DFS_INFO_106 {		typedef struct _DFS_INFO_106 {
DWORD State; // State of this root/link target.		DWORD State; // State of this root/link target.
// One of DFS_TARGET_STATE_*		// One of DFS_TARGET_STATE_*
DFS_TARGET_PRIORITY TargetPriority; // Priority of this target.		DFS_TARGET_PRIORITY TargetPriority; // Priority of this target.
} DFS_INFO_106, PDFS_INFO_106, LPDFS_INFO_106;		} DFS_INFO_106, PDFS_INFO_106, LPDFS_INFO_106;

//		//

		// Level 107:
		//
		typedef struct _DFS_INFO_107 {
		LPWSTR Comment; // Comment for this root/link.
		DWORD State; // State of this root/link. One of DFS_VOLUM
		E_STATE_*
		ULONG Timeout; // Referral TTL, in seconds, of root/link.
		ULONG PropertyFlagMask; // Indicates which flags in PropertyFlags ar
		e valid.
		ULONG PropertyFlags; // One of DFS_PROPERTY_FLAG_*

		#ifdef MIDL_PASS

		//
		// For use by the RPC marshalling code only.
		//

		ULONG SecurityDescriptorLength;

		//
		// Self-relative security descriptor to be associated
		// with DFS link (and stamped on the reparse-point
		// on disk).
		//

		[size_is(SecurityDescriptorLength)] PUCHAR pSecurityDescriptor;
		#else
		ULONG SdLengthReserved;
		PSECURITY_DESCRIPTOR pSecurityDescriptor;
		#endif
		} DFS_INFO_107, PDFS_INFO_107, LPDFS_INFO_107;

		//
		// Level 150:
		//
		typedef struct _DFS_INFO_150 {

		#ifdef MIDL_PASS

		//
		// For use by the RPC marshalling code only.
		//

		ULONG SecurityDescriptorLength;

		//
		// Self-relative security descriptor to be associated
		// with DFS link (and stamped on the reparse-point
		// on disk).
		//

		[size_is(SecurityDescriptorLength)] PUCHAR pSecurityDescriptor;
		#else
		ULONG SdLengthReserved;
		PSECURITY_DESCRIPTOR pSecurityDescriptor;
		#endif
		} DFS_INFO_150, PDFS_INFO_150, LPDFS_INFO_150;

		//

// Level 200:		// Level 200:
//		//
typedef struct _DFS_INFO_200 {		typedef struct _DFS_INFO_200 {
LPWSTR FtDfsName; // FtDfs name		LPWSTR FtDfsName; // FtDfs name
} DFS_INFO_200, PDFS_INFO_200, LPDFS_INFO_200;		} DFS_INFO_200, PDFS_INFO_200, LPDFS_INFO_200;

//		//
// Level 300:		// Level 300:
//		//

skipping to change at line 491		skipping to change at line 669
__in LPWSTR RootShare, // Share that host Dfs root		__in LPWSTR RootShare, // Share that host Dfs root
__reserved DWORD Flags // Flags for operation. Zero for no flags.		__reserved DWORD Flags // Flags for operation. Zero for no flags.
);		);

NET_API_STATUS NET_API_FUNCTION		NET_API_STATUS NET_API_FUNCTION
NetDfsAddFtRoot(		NetDfsAddFtRoot(
__in LPWSTR ServerName, // Server to remote to		__in LPWSTR ServerName, // Server to remote to
__in LPWSTR RootShare, // Share to make Dfs root		__in LPWSTR RootShare, // Share to make Dfs root
__in LPWSTR FtDfsName, // Name of FtDfs to create/join		__in LPWSTR FtDfsName, // Name of FtDfs to create/join
__in_opt LPWSTR Comment, // Comment		__in_opt LPWSTR Comment, // Comment

__reserved DWORD Flags // Flags for operation. Zero for no fla gs.		__in DWORD Flags // Flags for operation. Zero for no fla gs.
);		);

NET_API_STATUS NET_API_FUNCTION		NET_API_STATUS NET_API_FUNCTION
NetDfsRemoveFtRoot(		NetDfsRemoveFtRoot(
__in LPWSTR ServerName, // Server to remote to		__in LPWSTR ServerName, // Server to remote to
__in LPWSTR RootShare, // Share that host Dfs root		__in LPWSTR RootShare, // Share that host Dfs root
__in LPWSTR FtDfsName, // Name of FtDfs to remove or unjoin fro m.		__in LPWSTR FtDfsName, // Name of FtDfs to remove or unjoin fro m.
__reserved DWORD Flags // Flags for operation. Zero for no fla gs.		__reserved DWORD Flags // Flags for operation. Zero for no fla gs.
);		);


skipping to change at line 546		skipping to change at line 724

//		//
// Flags for NetDfsSetDcAddress()		// Flags for NetDfsSetDcAddress()
//		//

#define NET_DFS_SETDC_FLAGS 0x00000000		#define NET_DFS_SETDC_FLAGS 0x00000000
#define NET_DFS_SETDC_TIMEOUT 0x00000001		#define NET_DFS_SETDC_TIMEOUT 0x00000001
#define NET_DFS_SETDC_INITPKT 0x00000002		#define NET_DFS_SETDC_INITPKT 0x00000002

//		//

// Structures used for site reporting		// Structures used for site reporting. Last used in Windows 2000, maintained fo
		r
		// the obsolete SRVSVC RPC API NetrDfsManagerReportSiteInfo.
//		//

typedef struct {		typedef struct {
ULONG SiteFlags; // Below		ULONG SiteFlags; // Below
#ifdef MIDL_PASS		#ifdef MIDL_PASS
[string,unique] LPWSTR SiteName;		[string,unique] LPWSTR SiteName;
#else		#else
LPWSTR SiteName;		LPWSTR SiteName;
#endif		#endif
} DFS_SITENAME_INFO, PDFS_SITENAME_INFO, LPDFS_SITENAME_INFO;		} DFS_SITENAME_INFO, PDFS_SITENAME_INFO, LPDFS_SITENAME_INFO;

skipping to change at line 696		skipping to change at line 875

#define DFS_MOVE_FLAG_REPLACE_IF_EXISTS 0x00000001		#define DFS_MOVE_FLAG_REPLACE_IF_EXISTS 0x00000001

NET_API_STATUS NET_API_FUNCTION		NET_API_STATUS NET_API_FUNCTION
NetDfsRename(		NetDfsRename(
__in LPWSTR Path, // Current Win32 path in a Dfs		__in LPWSTR Path, // Current Win32 path in a Dfs
__in LPWSTR NewPath // New Win32 path in the same Dfs		__in LPWSTR NewPath // New Win32 path in the same Dfs
);		);

NET_API_STATUS NET_API_FUNCTION		NET_API_STATUS NET_API_FUNCTION

		NetDfsAddRootTarget(
		__in LPWSTR pDfsPath,
		__in_opt LPWSTR pTargetPath,
		__in ULONG MajorVersion,
		__in_opt LPWSTR pComment,
		__in ULONG Flags
		);

		//
		// Reuse existing definition used by NetrDfsRemoveFtRoot().
		//

		#ifndef DFS_FORCE_REMOVE
		#define DFS_FORCE_REMOVE 0x80000000
		#endif

		NET_API_STATUS NET_API_FUNCTION
		NetDfsRemoveRootTarget(
		__in LPWSTR pDfsPath,
		__in_opt LPWSTR pTargetPath,
		__in ULONG Flags
		);

		NET_API_STATUS NET_API_FUNCTION
NetDfsGetSecurity(		NetDfsGetSecurity(
__in LPWSTR DfsEntry Path,		__in LPWSTR DfsEntry Path,
__in SECURITY_INFORMATION Security Information,		__in SECURITY_INFORMATION Security Information,
__deref_out_bcount(lpcbSecurityDescriptor) PSECURITY_DESCRIPTOR ppSecur ityDescriptor,		__deref_out_bcount(lpcbSecurityDescriptor) PSECURITY_DESCRIPTOR ppSecur ityDescriptor,
__out LPDWORD lpcbSecu rityDescriptor		__out LPDWORD lpcbSecu rityDescriptor
);		);

NET_API_STATUS NET_API_FUNCTION		NET_API_STATUS NET_API_FUNCTION
NetDfsSetSecurity(		NetDfsSetSecurity(
__in LPWSTR DfsEntryPath,		__in LPWSTR DfsEntryPath,

skipping to change at line 740		skipping to change at line 943
__out LPDWORD lpcbSecu rityDescriptor		__out LPDWORD lpcbSecu rityDescriptor
);		);

NET_API_STATUS NET_API_FUNCTION		NET_API_STATUS NET_API_FUNCTION
NetDfsSetFtContainerSecurity(		NetDfsSetFtContainerSecurity(
__in LPWSTR DomainName,		__in LPWSTR DomainName,
__in SECURITY_INFORMATION SecurityInformation,		__in SECURITY_INFORMATION SecurityInformation,
__in PSECURITY_DESCRIPTOR pSecurityDescriptor		__in PSECURITY_DESCRIPTOR pSecurityDescriptor
);		);


		//
		// Origin of DFS namespace version information.
		//

		typedef enum {
		DFS_NAMESPACE_VERSION_ORIGIN_COMBINED = 0, // Max version {server, AD DS d
		omain}
		// can support.
		DFS_NAMESPACE_VERSION_ORIGIN_SERVER, // Max version server can suppo
		rt.
		DFS_NAMESPACE_VERSION_ORIGIN_DOMAIN // Max version AD DS domain can
		support.
		} DFS_NAMESPACE_VERSION_ORIGIN, *PDFS_NAMESPACE_VERSION_ORIGIN;

		//
		// Capabilities:
		// Set of bit flags which indicates support for a specific capability.
		//

		//
		// DFS namespace supports associating a security descriptor with DFS link
		// for Access-Based Directory Enumeration purposes.
		//

		#define DFS_NAMESPACE_CAPABILITY_ABDE ((ULONGLONG) 0x0000000000000001)

		typedef struct _DFS_SUPPORTED_NAMESPACE_VERSION_INFO {

		//
		// Domain-based DFS information.
		// Valid only if DomainDfsMajorVersion != 0.
		//

		ULONG DomainDfsMajorVersion;
		ULONG DomainDfsMinorVersion;
		ULONGLONG DomainDfsCapabilities;

		//
		// Standalone DFS information.
		// Valid only if StandaloneDfsMajorVersion != 0.
		//

		ULONG StandaloneDfsMajorVersion;
		ULONG StandaloneDfsMinorVersion;
		ULONGLONG StandaloneDfsCapabilities;
		} DFS_SUPPORTED_NAMESPACE_VERSION_INFO, *PDFS_SUPPORTED_NAMESPACE_VERSION_INFO;

		NET_API_STATUS NET_API_FUNCTION
		NetDfsGetSupportedNamespaceVersion(
		__in DFS_NAMESPACE_VERSION_ORIGIN Origin,
		__in_opt PWSTR pName,
		__deref_out PDFS_SUPPORTED_NAMESPACE_VERSION_INFO *ppVersionInfo
		);

#ifdef __cplusplus		#ifdef __cplusplus
}		}
#endif		#endif

#endif // _LMDFS_		#endif // _LMDFS_

End of changes. 9 change blocks.
3 lines changed or deleted		276 lines changed or added

lmerrlog.h (6.0.6002.18005-Windows 6.0)		lmerrlog.h (6.1.7601.17887-Windows 7.0)

skipping to change at line 1005		skipping to change at line 1005

#define NELOG_NetlogonServerAuthNoTrustSamAccount (ERRLOG2_BASE + 23)		#define NELOG_NetlogonServerAuthNoTrustSamAccount (ERRLOG2_BASE + 23)
/*		/*
* The session setup from computer '%1' failed because the security database		* The session setup from computer '%1' failed because the security database
* does not contain a trust account '%2' referenced by the specified compute r.		* does not contain a trust account '%2' referenced by the specified compute r.
*		*
* %n%nUSER ACTION		* %n%nUSER ACTION
*		*
* %nIf this is the first occurrence of this event for the specified compute r		* %nIf this is the first occurrence of this event for the specified compute r
* and account, this may be a transient issue that doesn't require any actio n		* and account, this may be a transient issue that doesn't require any actio n

* at this time. Otherwise, the following steps may be taken to resolve this		* at this time.
problem:		*
		* If this is a Read-Only Domain Controller and '%2' is a legitimate machine
		* account for the computer '%1' then '%1' should be marked cacheable for th
		is
		* location if appropriate or otherwise ensure connectivity to a domain cont
		roller
		* capable of servicing the request (for example a writable domain controlle
		r).
		*
		* Otherwise, the following steps may be taken to resolve this problem:
*		*
* %n%nIf '%2' is a legitimate machine account for the computer '%1', then ' %1'		* %n%nIf '%2' is a legitimate machine account for the computer '%1', then ' %1'
* should be rejoined to the domain.		* should be rejoined to the domain.
*		*
* %n%nIf '%2' is a legitimate interdomain trust account, then the trust sho uld		* %n%nIf '%2' is a legitimate interdomain trust account, then the trust sho uld
* be recreated.		* be recreated.
*		*
* %n%nOtherwise, assuming that '%2' is not a legitimate account, the follow ing		* %n%nOtherwise, assuming that '%2' is not a legitimate account, the follow ing
* action should be taken on '%1':		* action should be taken on '%1':
*		*

skipping to change at line 1336		skipping to change at line 1343
* %nReturned Response Code (RCODE): %4		* %nReturned Response Code (RCODE): %4
* %nReturned Status Code: %5		* %nReturned Status Code: %5
*		*
* %n%nFor computers and users to locate this domain controller, this recor d must be		* %n%nFor computers and users to locate this domain controller, this recor d must be
* registered in DNS.		* registered in DNS.
*		*
* %n%nUSER ACTION		* %n%nUSER ACTION
*		*
* %nDetermine what might have caused this failure, resolve the problem, an d initiate		* %nDetermine what might have caused this failure, resolve the problem, an d initiate
* registration of the DNS records by the domain controller. To determine w hat might		* registration of the DNS records by the domain controller. To determine w hat might

* have caused this failure, run DCDiag.exe. You can find this program on t		* have caused this failure, run DCDiag.exe. To learn more about DCDiag.exe
he Windows		, see Help
* Server 2003 installation CD in Support\Tools\support.cab. To learn more		* and Support Center. To initiate registration of the DNS records by this
about		domain
* DCDiag.exe, see Help and Support Center. To initiate registration of the		* controller, run 'nltest.exe /dsregdns' from the command prompt on the do
DNS records by		main controller
* this domain controller, run 'nltest.exe /dsregdns' from the command prom		* or restart Net Logon service. %n Or, you can manually add this record t
pt on the domain		o DNS, but it
* controller or restart Net Logon service. Nltest.exe is available in the		* is not recommended.
Microsoft Windows
* Server Resource Kit CD. %n Or, you can manually add this record to DNS,
but it is not
* recommended.
*		*
* %n%nADDITIONAL DATA		* %n%nADDITIONAL DATA
* %nError Value: %2		* %nError Value: %2
*/		*/

#define NELOG_NetlogonDynamicDnsDeregisterFailure (ERRLOG2_BASE + 75)		#define NELOG_NetlogonDynamicDnsDeregisterFailure (ERRLOG2_BASE + 75)
/*		/*
* The dynamic deletion of the DNS record '%1' failed on the following DNS server:		* The dynamic deletion of the DNS record '%1' failed on the following DNS server:
*		*
* %n%nDNS server IP address: %3		* %n%nDNS server IP address: %3

skipping to change at line 1419		skipping to change at line 1424
*		*
* %n- TCP/IP properties of the network connections of this computer contain wrong IP address(es) of the preferred and alternate DNS servers		* %n- TCP/IP properties of the network connections of this computer contain wrong IP address(es) of the preferred and alternate DNS servers
* %n- Specified preferred and alternate DNS servers are not running		* %n- Specified preferred and alternate DNS servers are not running
* %n- DNS server(s) primary for the records to be registered is not running		* %n- DNS server(s) primary for the records to be registered is not running
* %n- Preferred or alternate DNS servers are configured with wrong root hin ts		* %n- Preferred or alternate DNS servers are configured with wrong root hin ts
* %n- Parent DNS zone contains incorrect delegation to the child zone autho ritative for the DNS records that failed registration		* %n- Parent DNS zone contains incorrect delegation to the child zone autho ritative for the DNS records that failed registration
*		*
* %n%nUSER ACTION		* %n%nUSER ACTION
*		*
* %nFix possible misconfiguration(s) specified above and initiate registrat ion or deletion of		* %nFix possible misconfiguration(s) specified above and initiate registrat ion or deletion of

* the DNS records by running 'nltest.exe /dsregdns' from the command prompt		* the DNS records by running 'nltest.exe /dsregdns' from the command prompt
or by restarting		on the domain
* Net Logon service. Nltest.exe is available in the Microsoft Windows Serve		* controller or by restarting Net Logon service on the domain controller.
r Resource Kit CD.
*/		*/

#define NELOG_NetlogonDynamicDnsFailure (ERRLOG2_BASE + 82)		#define NELOG_NetlogonDynamicDnsFailure (ERRLOG2_BASE + 82)
/*		/*
* Dynamic registration or deregistration of one or more DNS records failed with the following error: %n%1		* Dynamic registration or deregistration of one or more DNS records failed with the following error: %n%1
*/		*/

#define NELOG_NetlogonRpcCallCancelled (ERRLOG2_BASE + 83)		#define NELOG_NetlogonRpcCallCancelled (ERRLOG2_BASE + 83)
/*		/*
* The session setup to the Windows NT or Windows 2000 Domain Controller %1 for the domain %2		* The session setup to the Windows NT or Windows 2000 Domain Controller %1 for the domain %2

skipping to change at line 1676		skipping to change at line 1681
* %nThe specified port is configured via the Group Policy or via a registry value 'DcTcpipPort'		* %nThe specified port is configured via the Group Policy or via a registry value 'DcTcpipPort'
* under the 'HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Netlogon\ Parameters'		* under the 'HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Netlogon\ Parameters'
* registry key; the value configured through the Group Policy takes precede nce. If the		* registry key; the value configured through the Group Policy takes precede nce. If the
* port specified is in error, reset it to a correct value. You can also rem ove this		* port specified is in error, reset it to a correct value. You can also rem ove this
* configuration for the port in which case the port will be assigned dynami cally by		* configuration for the port in which case the port will be assigned dynami cally by
* the endpoint mapper at the time the NetLogon service on remote machines m akes RPC connections		* the endpoint mapper at the time the NetLogon service on remote machines m akes RPC connections
* to this domain controller. After the misconfiguration is corrected, resta rt the NetLogon		* to this domain controller. After the misconfiguration is corrected, resta rt the NetLogon
* service on this machine and verify that this event log no longer appears.		* service on this machine and verify that this event log no longer appears.
*/		*/


		#define NELOG_NetlogonPartialSiteMappingForClients (ERRLOG2_BASE + 110)
		/*
		* During the past %1 hours, this domain controller has received %2 connecti
		ons
		* from dual-stack IPv4/IPv6 clients with partial subnet-site mappings. A cl
		ient
		* has a partial subnet-site mapping if its IPv4 address is mapped to a site
		but
		* its global IPv6 address is not mapped to a site, or vice versa. To ensure
		correct
		* behavior for applications running on member computers and servers that re
		ly on
		* subnet-site mappings, dual-stack IPv4/IPv6 clients must have both IPv4 an
		d global
		* IPv6 addresses mapped to the same site. If a partially mapped client atte
		mpts
		* to connect to this domain controller using its unmapped IP address, its m
		apped
		* address is used for the client's site mapping.
		*
		* %n%nThe log files %SystemRoot%\debug\netlogon.log or %SystemRoot%\debug\n
		etlogon.bak
		* contain the name, unmapped IP address and mapped IP address for each part
		ially
		* mapped client. The log files may also contain unrelated debugging informa
		tion.
		* To locate the information pertaining to partial-subnet mappings, search f
		or
		* lines that contain the text 'PARTIAL_CLIENT_SITE_MAPPING:'. The first wor
		d after
		* this text is the client name. Following the client name is the client's u
		nmapped
		* IP address (the IP address that does not have a subnet-site mapping) and
		the
		* client's mapped IP address, which was used to return site information.
		*
		* %n%nUSER ACTION
		*
		* %nUse the Active Directory Sites and Services management console (MMC) sn
		ap-in
		* to add the subnet mapping for the unmapped IP addresses to the same site
		being
		* used by the mapped IP addresses. When adding site mappings for IPv6 addre
		sses,
		* you should use global IPv6 addresses and not for instance temporary, link
		-local
		* or site-local IPv6 addresses.
		*
		* %n%nThe default maximum size of the log files is %3 bytes. The current ma
		ximum
		* size is %4 bytes. To set a different maximum size, create the following r
		egistry
		* DWORD value to specify the maximum size in bytes:
		*
		* %nHKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Netlogon\Parameter
		s\LogFileMaxSize
		*/

		#define NELOG_NetlogonRemoteDynamicDnsRegisterFailure (ERRLOG2_BASE + 111)
		/*
		* The dynamic registration of the DNS record '%1' for the remote domain co
		ntroller '%3'
		* failed on the following DNS server:
		*
		* %n%nDNS server IP address: %4
		* %nReturned Response Code (RCODE): %5
		* %nReturned Status Code: %6
		*
		* %n%nFor computers and users to locate the domain controller '%3', this r
		ecord must be
		* registered in DNS.
		*
		* %n%nUSER ACTION
		*
		* %nDetermine what might have caused this failure, resolve the problem, an
		d initiate
		* registration of the DNS records by the domain controller '%3'. For help
		with determining
		* and resolving the problem, see Help and Support for information about tr
		oubleshooting
		* DNS. To initiate registration of the DNS records by the domain controlle
		r '%3', run
		* 'nltest.exe /dsregdns' from the command prompt on the domain controller
		'%3' or restart
		* the Net Logon service on the domain controller '%3'. Nltest.exe is a com
		mand line tool
		* that is built into Windows Server.
		* %n As a workaround, you can manually add this record to DNS, but it is n
		ot recommended
		* because you then must manually update any changes it requires hereafter.
		*
		* %n%nADDITIONAL DATA
		* %nError Value: %2
		*/

		#define NELOG_NetlogonRemoteDynamicDnsDeregisterFailure (ERRLOG2_BASE + 112)
		/*
		* The dynamic deregistration of the DNS record '%1' for the remote domain
		controller
		* '%3' failed on the following DNS server:
		*
		* %n%nDNS server IP address: %4
		* %nReturned Response Code (RCODE): %5
		* %nReturned Status Code: %6
		*
		* %n%nUSER ACTION
		*
		* %nTo prevent remote computers from attempting to connect to the domain c
		ontroller '%3'
		* using an invalid record, delete the record '%1' manually or troubleshoot
		the root cause
		* behind the dynamic deregistration failure. To learn more about troublesh
		ooting DNS, see
		* Help and Support.
		*
		* %n%nADDITIONAL DATA
		* %nError Value: %2
		*/

		#define NELOG_NetlogonRejectedRemoteDynamicDnsRegister (ERRLOG2_BASE + 113)
		/*
		* The dynamic registration request for the DNS record '%1' has been reject
		ed by the
		* remote domain controller '%2'. Error: '%3'
		*
		* %n%nFor computers and users to locate this domain controller, this recor
		d must be
		* registered in DNS. If the problem persists, please contact your domain a
		dministrator.
		*/

		#define NELOG_NetlogonRejectedRemoteDynamicDnsDeregister (ERRLOG2_BASE + 114)
		/*
		* The dynamic deregistration request of the DNS record '%1' has been rejec
		ted by the
		* remote domain controller '%2'. Error: '%3'
		*
		* %n%nTo prevent remote computers from connecting unnecessarily to this do
		main controller,
		* an administrator with sufficient privileges must manually delete the rec
		ord on the DNS
		* server that hosts it.
		*/

		#define NELOG_NetlogonRemoteDynamicDnsUpdateRequestFailure (ERRLOG2_BASE + 115
		)
		/*
		* The remoting of the dynamic update request for the local domain controll
		er's DNS records
		* through a secure session has failed with error '%1'.
		*
		* %n%nFor other computers and member servers to locate this domain control
		ler, the appropriate
		* records must be registered in DNS. On this domain controller, look for e
		vents related to
		* failure to set up a secure session to determine why the request is faili
		ng. If the problem
		* persists, please contact your domain administrator.
		*/

#ifdef __cplusplus		#ifdef __cplusplus
}		}
#endif		#endif

#endif // _LMERRLOG_		#endif // _LMERRLOG_

End of changes. 4 change blocks.
19 lines changed or deleted		183 lines changed or added

lmjoin.h (6.0.6002.18005-Windows 6.0)		lmjoin.h (6.1.7601.17887-Windows 7.0)

skipping to change at line 82		skipping to change at line 82
// even if it is already joined to a domain		// even if it is already joined to a domain
#define NETSETUP_JOIN_UNSECURE 0x00000040 // Performs an unsecure join		#define NETSETUP_JOIN_UNSECURE 0x00000040 // Performs an unsecure join
#define NETSETUP_MACHINE_PWD_PASSED 0x00000080 // Indicates that the machine (n ot user) password		#define NETSETUP_MACHINE_PWD_PASSED 0x00000080 // Indicates that the machine (n ot user) password
// is passed. Valid only for un secure joins		// is passed. Valid only for un secure joins
#define NETSETUP_DEFER_SPN_SET 0x00000100 // Specifies that writting SPN a nd DnsHostName		#define NETSETUP_DEFER_SPN_SET 0x00000100 // Specifies that writting SPN a nd DnsHostName
// attributes on the computer o bject should be		// attributes on the computer o bject should be
// defered until rename that wi ll follow join		// defered until rename that wi ll follow join

#define NETSETUP_JOIN_DC_ACCOUNT 0x00000200 // Allow join if existing accoun t is a DC		#define NETSETUP_JOIN_DC_ACCOUNT 0x00000200 // Allow join if existing accoun t is a DC
#define NETSETUP_JOIN_WITH_NEW_NAME 0x00000400 // Check for computer name chang e		#define NETSETUP_JOIN_WITH_NEW_NAME 0x00000400 // Check for computer name chang e

		#define NETSETUP_JOIN_READONLY 0x00000800 // Perform join using a pre-crea
		ted account w/o requiring a writable DC
		#define NETSETUP_DNS_NAME_CHANGES_ONLY 0x00001000 // When performing machin
		e rename only update DNS based names

#define NETSETUP_INSTALL_INVOCATION 0x00040000 // The APIs were invoked during install		#define NETSETUP_INSTALL_INVOCATION 0x00040000 // The APIs were invoked during install


		#define NETSETUP_AMBIGUOUS_DC 0x00001000 // When joiing the domain don't
		try to set the
		// preferred DC in the registry.
		#define NETSETUP_NO_NETLOGON_CACHE 0x00002000 // Don't create the netlogon cac
		he
		#define NETSETUP_DONT_CONTROL_SERVICES 0x00004000 // Don't force netlogon to sta
		rt
		#define NETSETUP_SET_MACHINE_NAME 0x00008000 // For offline join only, set ta
		rget machine hostname and NB name.
		#define NETSETUP_FORCE_SPN_SET 0x00010000 // Override other settings durin
		g domain join
		// and attempt to set the SPN.
		#define NETSETUP_NO_ACCT_REUSE 0x00020000 // Do not reuse an existing acco
		unt

#define NETSETUP_IGNORE_UNSUPPORTED_FLAGS 0x10000000 // If this bit is set, un recognized flags		#define NETSETUP_IGNORE_UNSUPPORTED_FLAGS 0x10000000 // If this bit is set, un recognized flags
// will be ignored by th e NetJoin API and		// will be ignored by th e NetJoin API and
// the API will behave a s if the flags		// the API will behave a s if the flags
// were not set.		// were not set.


#define NETSETUP_VALID_UNJOIN_FLAGS (NETSETUP_ACCT_DELETE \| NETSETUP_IGNORE_UNSU		#define NETSETUP_VALID_UNJOIN_FLAGS (NETSETUP_ACCT_DELETE \| NETSETUP_IGNORE_UNSU
PPORTED_FLAGS)		PPORTED_FLAGS \| NETSETUP_JOIN_DC_ACCOUNT)

		// The following flags are used when the system is processing information left f
		rom a prior offline
		// join. We want to force DC discovery and we don't want to create the netlogon
		cache. We also
		// don't want to immediately force netlogon to start, let it start on its own.
		#define NETSETUP_PROCESS_OFFLINE_FLAGS ( NETSETUP_JOIN_DOMAIN \|
		\
		NETSETUP_DOMAIN_JOIN_IF_JOINED \|
		\
		NETSETUP_JOIN_WITH_NEW_NAME \|
		\
		NETSETUP_DONT_CONTROL_SERVICES \|
		\
		NETSETUP_MACHINE_PWD_PASSED)

//		//
// 0x80000000 is reserved for internal use only		// 0x80000000 is reserved for internal use only
//		//

//		//
// Joins a machine to the domain.		// Joins a machine to the domain.
//		//
NET_API_STATUS		NET_API_STATUS
NET_API_FUNCTION		NET_API_FUNCTION
NetJoinDomain(		NetJoinDomain(
IN LPCWSTR lpServer OPTIONAL,		IN LPCWSTR lpServer OPTIONAL,
IN LPCWSTR lpDomain,		IN LPCWSTR lpDomain,
IN LPCWSTR lpAccountOU, OPTIONAL		IN LPCWSTR lpAccountOU, OPTIONAL
IN LPCWSTR lpAccount OPTIONAL,		IN LPCWSTR lpAccount OPTIONAL,
__in_opt IN LPCWSTR lpPassword OPTIONAL,		__in_opt IN LPCWSTR lpPassword OPTIONAL,
IN DWORD fJoinOptions		IN DWORD fJoinOptions
);		);


		#if(_WIN32_WINNT >= 0x0601)

		//
		// Flags to determine the behavior of NetProvisionComputerAccount
		//

		// The caller requires account creation by privilege, this option will cause a r
		etry
		// on failure using down level account creation APIs.
		//
		#define NETSETUP_PROVISION_DOWNLEVEL_PRIV_SUPPORT 0x00000001

		// If the named account already exists an attempt will be made to reuse. Require
		s
		// sufficient credentials i.e. Domain Administrator or the object owner.
		//
		#define NETSETUP_PROVISION_REUSE_ACCOUNT 0x00000002

		// Use the default machine account password which is the machine name in lowerca
		se.
		//
		#define NETSETUP_PROVISION_USE_DEFAULT_PASSWORD 0x00000004

		// Do not try to find the account on any DC in the domain. This is faster but
		// should only be used when the caller is certain that an account by the same
		// name hasn't recently been created. Only valid when specifying the target DC.
		// When the pre-requisites are met, this option allows for must faster provision
		ing
		// useful for scenarios such as batch processing.
		//
		#define NETSETUP_PROVISION_SKIP_ACCOUNT_SEARCH 0x00000008

		//
		// The following are reserved for internal use.
		//

		// The operation is online.
		// This is an internal option not available through the API.
		//
		#define NETSETUP_PROVISION_ONLINE_CALLER 0x40000000

		// Validate the machine password only. This is an internal option not available
		// through the API.
		//
		#define NETSETUP_PROVISION_CHECK_PWD_ONLY 0x80000000

		NET_API_STATUS
		NET_API_FUNCTION
		NetProvisionComputerAccount(
		__in LPCWSTR lpDomain,
		__in LPCWSTR lpMachineName,
		__in_opt LPCWSTR lpMachineAccountOU,
		__in_opt LPCWSTR lpDcName,
		__in DWORD dwOptions,
		__deref_opt_out PBYTE *pProvisionBinData,
		__out_opt DWORD *pdwProvisionBinDataSize,
		__deref_opt_out LPWSTR *pProvisionTextData
		);

		NET_API_STATUS
		NET_API_FUNCTION
		NetRequestOfflineDomainJoin(
		__in_bcount(cbProvisionBinDataSize) BYTE *pProvisionBinData,
		__in DWORD cbProvisionBinDataSize,
		__in DWORD dwOptions,
		__in LPCWSTR lpWindowsPath
		);

		#endif // (_WIN32_WINNT >= 0x0601)

NET_API_STATUS		NET_API_STATUS
NET_API_FUNCTION		NET_API_FUNCTION
NetUnjoinDomain(		NetUnjoinDomain(
IN LPCWSTR lpServer OPTIONAL,		IN LPCWSTR lpServer OPTIONAL,
IN LPCWSTR lpAccount OPTIONAL,		IN LPCWSTR lpAccount OPTIONAL,
__in_opt IN LPCWSTR lpPassword OPTIONAL,		__in_opt IN LPCWSTR lpPassword OPTIONAL,
IN DWORD fUnjoinOptions		IN DWORD fUnjoinOptions
);		);

NET_API_STATUS		NET_API_STATUS

skipping to change at line 167		skipping to change at line 253
NET_API_FUNCTION		NET_API_FUNCTION
NetGetJoinableOUs(		NetGetJoinableOUs(
IN LPCWSTR lpServer OPTIONAL,		IN LPCWSTR lpServer OPTIONAL,
IN LPCWSTR lpDomain,		IN LPCWSTR lpDomain,
IN LPCWSTR lpAccount OPTIONAL,		IN LPCWSTR lpAccount OPTIONAL,
__in_opt IN LPCWSTR lpPassword OPTIONAL,		__in_opt IN LPCWSTR lpPassword OPTIONAL,
__out_opt OUT DWORD *OUCount,		__out_opt OUT DWORD *OUCount,
__deref_out OUT LPWSTR **OUs		__deref_out OUT LPWSTR **OUs
);		);


		#if(_WIN32_WINNT >= 0x0501)

//		//
// Computer rename preparation APIs		// Computer rename preparation APIs
//		//

#define NET_IGNORE_UNSUPPORTED_FLAGS 0x01		#define NET_IGNORE_UNSUPPORTED_FLAGS 0x01

NET_API_STATUS		NET_API_STATUS
NET_API_FUNCTION		NET_API_FUNCTION
NetAddAlternateComputerName(		NetAddAlternateComputerName(
IN LPCWSTR Server OPTIONAL,		IN LPCWSTR Server OPTIONAL,

skipping to change at line 226		skipping to change at line 314
NET_API_STATUS		NET_API_STATUS
NET_API_FUNCTION		NET_API_FUNCTION
NetEnumerateComputerNames(		NetEnumerateComputerNames(
IN LPCWSTR Server OPTIONAL,		IN LPCWSTR Server OPTIONAL,
IN NET_COMPUTER_NAME_TYPE NameType,		IN NET_COMPUTER_NAME_TYPE NameType,
IN ULONG Reserved,		IN ULONG Reserved,
__out OUT PDWORD EntryCount,		__out OUT PDWORD EntryCount,
__deref_out OUT LPWSTR **ComputerNames		__deref_out OUT LPWSTR **ComputerNames
);		);


		#endif // (_WIN32_WINNT >= 0x0501)

#ifdef __cplusplus		#ifdef __cplusplus
}		}
#endif		#endif

#endif // __LMJOIN_H__		#endif // __LMJOIN_H__

End of changes. 6 change blocks.
2 lines changed or deleted		110 lines changed or added

lmshare.h (6.0.6002.18005-Windows 6.0)		lmshare.h (6.1.7601.17887-Windows 7.0)

skipping to change at line 61		skipping to change at line 61
__in_opt IN LMSTR servername,		__in_opt IN LMSTR servername,
IN DWORD level,		IN DWORD level,
__inout IN LPBYTE buf,		__inout IN LPBYTE buf,
__out_opt OUT LPDWORD parm_err		__out_opt OUT LPDWORD parm_err
);		);

NET_API_STATUS NET_API_FUNCTION		NET_API_STATUS NET_API_FUNCTION
NetShareEnum (		NetShareEnum (
__in_opt IN LMSTR servername,		__in_opt IN LMSTR servername,
__in IN DWORD level,		__in IN DWORD level,

__deref_out OUT LPBYTE *bufptr,		__deref_out_xcount("size varies with level") OUT LPBYTE *bufptr,
__in IN DWORD prefmaxlen,		__in IN DWORD prefmaxlen,
__out OUT LPDWORD entriesread,		__out OUT LPDWORD entriesread,
__out OUT LPDWORD totalentries,		__out OUT LPDWORD totalentries,
__inout_opt IN OUT LPDWORD resume_handle		__inout_opt IN OUT LPDWORD resume_handle
);		);

NET_API_STATUS NET_API_FUNCTION		NET_API_STATUS NET_API_FUNCTION
NetShareEnumSticky (		NetShareEnumSticky (
__in_opt IN LMSTR servername,		__in_opt IN LMSTR servername,
IN DWORD level,		IN DWORD level,

skipping to change at line 84		skipping to change at line 84
__out OUT LPDWORD entriesread,		__out OUT LPDWORD entriesread,
__out OUT LPDWORD totalentries,		__out OUT LPDWORD totalentries,
__inout_opt IN OUT LPDWORD resume_handle		__inout_opt IN OUT LPDWORD resume_handle
);		);

NET_API_STATUS NET_API_FUNCTION		NET_API_STATUS NET_API_FUNCTION
NetShareGetInfo (		NetShareGetInfo (
__in_opt IN LMSTR servername,		__in_opt IN LMSTR servername,
__in_opt IN LMSTR netname,		__in_opt IN LMSTR netname,
__in IN DWORD level,		__in IN DWORD level,

__deref_opt_out OUT LPBYTE *bufptr		__deref_opt_out_xcount("size varies with level") OUT LPBYTE *bufptr
);		);

NET_API_STATUS NET_API_FUNCTION		NET_API_STATUS NET_API_FUNCTION
NetShareSetInfo (		NetShareSetInfo (
__in_opt IN LMSTR servername,		__in_opt IN LMSTR servername,
__in_opt IN LMSTR netname,		__in_opt IN LMSTR netname,
IN DWORD level,		IN DWORD level,
__inout_opt IN LPBYTE buf,		__inout_opt IN LPBYTE buf,
__out_opt OUT LPDWORD parm_err		__out_opt OUT LPDWORD parm_err
);		);

skipping to change at line 289		skipping to change at line 289
#define STYPE_IPC 3		#define STYPE_IPC 3

#define STYPE_TEMPORARY 0x40000000		#define STYPE_TEMPORARY 0x40000000
#define STYPE_SPECIAL 0x80000000		#define STYPE_SPECIAL 0x80000000

#define SHI_USES_UNLIMITED (DWORD)-1		#define SHI_USES_UNLIMITED (DWORD)-1

//		//
// Flags values for the 501 and 1005 levels		// Flags values for the 501 and 1005 levels
//		//

#define SHI1005_FLAGS_DFS 0x01 // Share is in the DFS		#define SHI1005_FLAGS_DFS 0x0001 // Share is in the DFS
#define SHI1005_FLAGS_DFS_ROOT 0x02 // Share is root of DFS		#define SHI1005_FLAGS_DFS_ROOT 0x0002 // Share is root of DFS


#define CSC_MASK 0x30 // Used to mask off the following states		#define CSC_MASK_EXT 0x2030 // Used to mask off the following stat
		es (including SHI1005_FLAGS_ENABLE_HASH)
		#define CSC_MASK 0x0030 // Used to mask off the following stat
		es


#define CSC_CACHE_MANUAL_REINT 0x00 // No automatic file by file reintegrati		#define CSC_CACHE_MANUAL_REINT 0x0000 // No automatic file by file reintegra
on		tion
#define CSC_CACHE_AUTO_REINT 0x10 // File by file reintegration is OK		#define CSC_CACHE_AUTO_REINT 0x0010 // File by file reintegration is OK
#define CSC_CACHE_VDO 0x20 // no need to flow opens		#define CSC_CACHE_VDO 0x0020 // no need to flow opens
#define CSC_CACHE_NONE 0x30 // no CSC for this share		#define CSC_CACHE_NONE 0x0030 // no CSC for this share

#define SHI1005_FLAGS_RESTRICT_EXCLUSIVE_OPENS 0x0100 // Used to disal low read-deny read behavior		#define SHI1005_FLAGS_RESTRICT_EXCLUSIVE_OPENS 0x0100 // Used to disal low read-deny read behavior
#define SHI1005_FLAGS_FORCE_SHARED_DELETE 0x0200 // Used to allow s force shared delete		#define SHI1005_FLAGS_FORCE_SHARED_DELETE 0x0200 // Used to allow s force shared delete
#define SHI1005_FLAGS_ALLOW_NAMESPACE_CACHING 0x0400 // The clients m ay cache the namespace		#define SHI1005_FLAGS_ALLOW_NAMESPACE_CACHING 0x0400 // The clients m ay cache the namespace

#define SHI1005_FLAGS_ACCESS_BASED_DIRECTORY_ENUM 0x0800 // Trim visibl		#define SHI1005_FLAGS_ACCESS_BASED_DIRECTORY_ENUM 0x0800 // Trim visible
e files in enumerations based on access		files in enumerations based on access
		#define SHI1005_FLAGS_FORCE_LEVELII_OPLOCK 0x1000 // Only issue le
		vel2 oplock
		#define SHI1005_FLAGS_ENABLE_HASH 0x2000 // Enable hash g
		eneration and retrieval requests from share

//		//
// The subset of 1005 infolevel flags that can be set via the API		// The subset of 1005 infolevel flags that can be set via the API
//		//

#define SHI1005_VALID_FLAGS_SET (CSC_MASK\| \		#define SHI1005_VALID_FLAGS_SET (CSC_MASK\| \
SHI1005_FLAGS_RESTRICT_EXCLUSIVE_OPENS\| \		SHI1005_FLAGS_RESTRICT_EXCLUSIVE_OPENS\| \
SHI1005_FLAGS_FORCE_SHARED_DELETE\| \		SHI1005_FLAGS_FORCE_SHARED_DELETE\| \
SHI1005_FLAGS_ALLOW_NAMESPACE_CACHING\| \		SHI1005_FLAGS_ALLOW_NAMESPACE_CACHING\| \

SHI1005_FLAGS_ACCESS_BASED_DIRECTORY_ENUM)		SHI1005_FLAGS_ACCESS_BASED_DIRECTORY_ENUM\|
		\
		SHI1005_FLAGS_FORCE_LEVELII_OPLOCK\|
		\
		SHI1005_FLAGS_ENABLE_HASH)

#endif // _LMSHARE_		#endif // _LMSHARE_

//		//
// SESSION API		// SESSION API
//		//

#ifndef _LMSESSION_		#ifndef _LMSESSION_
#define _LMSESSION_		#define _LMSESSION_


End of changes. 7 change blocks.
13 lines changed or deleted		24 lines changed or added

lmwksta.h (6.0.6002.18005-Windows 6.0)		lmwksta.h (6.1.7601.17887-Windows 7.0)

skipping to change at line 49		skipping to change at line 49
#include <lmuseflg.h> // Deletion force level flags		#include <lmuseflg.h> // Deletion force level flags

//		//
// Function Prototypes		// Function Prototypes
//		//

NET_API_STATUS NET_API_FUNCTION		NET_API_STATUS NET_API_FUNCTION
NetWkstaGetInfo (		NetWkstaGetInfo (
__in_opt IN LMSTR servername OPTIONAL,		__in_opt IN LMSTR servername OPTIONAL,
IN DWORD level,		IN DWORD level,

__deref_opt_out OUT LPBYTE *bufptr		__deref_opt_out_xcount("size varies with level") OUT LPBYTE *bufptr
);		);

NET_API_STATUS NET_API_FUNCTION		NET_API_STATUS NET_API_FUNCTION
NetWkstaSetInfo (		NetWkstaSetInfo (
__in_opt IN LMSTR servername OPTIONAL,		__in_opt IN LMSTR servername OPTIONAL,
IN DWORD level,		IN DWORD level,
IN LPBYTE buffer,		IN LPBYTE buffer,
__out_opt OUT LPDWORD parm_err OPTIONAL		__out_opt OUT LPDWORD parm_err OPTIONAL
);		);


End of changes. 1 change blocks.
1 lines changed or deleted		1 lines changed or added

This html diff was produced by rfcdiff 1.41.