Merge pull request #7077 from JohannesWilde/AvoidDuplicateDefinition

ethomson · web-flow · commit dbc19dc08e6d · 2025-06-05T14:00:40.000+01:00
Avoid duplicate definition of git_http_auth_dummy.
diff --git a/src/libgit2/transports/auth_sspi.c b/src/libgit2/transports/auth_sspi.c
@@ -324,18 +324,22 @@ static int sspi_init_context(
 	return 0;
 }
 
+#ifdef GIT_AUTH_NEGOTIATE
 int git_http_auth_negotiate(
 	git_http_auth_context **out,
 	const git_net_url *url)
 {
 	return sspi_init_context(out, GIT_HTTP_AUTH_NEGOTIATE, url);
 }
+#endif
 
+#ifdef GIT_AUTH_NTLM
 int git_http_auth_ntlm(
 	git_http_auth_context **out,
 	const git_net_url *url)
 {
 	return sspi_init_context(out, GIT_HTTP_AUTH_NTLM, url);
 }
+#endif
 
 #endif /* GIT_WIN32 */

Original file line number	Diff line number	Diff line change
`@@ -324,18 +324,22 @@ static int sspi_init_context(`
`324`	`324`	`return 0;`
`325`	`325`	`}`
`326`	`326`
	`327`	`+#ifdef GIT_AUTH_NEGOTIATE`
`327`	`328`	`int git_http_auth_negotiate(`
`328`	`329`	`git_http_auth_context **out,`
`329`	`330`	`const git_net_url *url)`
`330`	`331`	`{`
`331`	`332`	`return sspi_init_context(out, GIT_HTTP_AUTH_NEGOTIATE, url);`
`332`	`333`	`}`
	`334`	`+#endif`
`333`	`335`
	`336`	`+#ifdef GIT_AUTH_NTLM`
`334`	`337`	`int git_http_auth_ntlm(`
`335`	`338`	`git_http_auth_context **out,`
`336`	`339`	`const git_net_url *url)`
`337`	`340`	`{`
`338`	`341`	`return sspi_init_context(out, GIT_HTTP_AUTH_NTLM, url);`
`339`	`342`	`}`
	`343`	`+#endif`
`340`	`344`
`341`	`345`	`#endif /* GIT_WIN32 */`